diff --git a/App/App.pro b/App/App.pro index ecfa51de9b..cbda44b8fe 100644 --- a/App/App.pro +++ b/App/App.pro @@ -22,7 +22,7 @@ TARGET = Natron # the list of currently maintained versions (those that have to be merged into the master branch) VERSION_21 = 2.1.10 VERSION_22 = 2.2.10 -VERSION_23 = 2.3.15 +VERSION_23 = 2.3.16 VERSION_30 = 3.0.0 # The version for this branch diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a1bd7abb6..d3d1f26c6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ # History +## Version 2.3.16 + +### Plugins + +- Fix another bug in DenoiseSharpen that caused crash when stoping/aborting. #300 + + ## Version 2.3.15 - Inputs of the selected nodes are now always visible. diff --git a/Documentation/source/conf.py b/Documentation/source/conf.py index 022dab5c17..c216699132 100644 --- a/Documentation/source/conf.py +++ b/Documentation/source/conf.py @@ -51,7 +51,7 @@ # the list of currently maintained versions (those that have to be merged into the master branch) version_21 = '2.1.10' version_22 = '2.2.10' -version_23 = '2.3.15' +version_23 = '2.3.16' version_30 = '3.0.0' # The version for this branch diff --git a/Documentation/source/devel/conf.py b/Documentation/source/devel/conf.py index 273e872a2e..3bbe91ee79 100644 --- a/Documentation/source/devel/conf.py +++ b/Documentation/source/devel/conf.py @@ -57,7 +57,7 @@ # the list of currently maintained versions (those that have to be merged into the master branch) version_21 = '2.1.10' version_22 = '2.2.10' -version_23 = '2.3.15' +version_23 = '2.3.16' version_30 = '3.0.0' # The version for this branch diff --git a/Documentation/source/guide/conf.py b/Documentation/source/guide/conf.py index a8c8b5c51e..ffb8ba0ea2 100644 --- a/Documentation/source/guide/conf.py +++ b/Documentation/source/guide/conf.py @@ -51,7 +51,7 @@ # the list of currently maintained versions (those that have to be merged into the master branch) version_21 = '2.1.10' version_22 = '2.2.10' -version_23 = '2.3.15' +version_23 = '2.3.16' version_30 = '3.0.0' # The version for this branch diff --git a/Global/Macros.h b/Global/Macros.h index 7593405e7e..b4dc7371ca 100644 --- a/Global/Macros.h +++ b/Global/Macros.h @@ -121,10 +121,10 @@ namespace NATRON_PYTHON_NAMESPACE { } #define NATRON_VERSION_MINOR_30 0 #define NATRON_VERSION_REVISION_30 0 -// RB-2: 2.3.15 +// RB-2: 2.3.16 #define NATRON_VERSION_MAJOR_23 2 #define NATRON_VERSION_MINOR_23 3 -#define NATRON_VERSION_REVISION_23 15 +#define NATRON_VERSION_REVISION_23 16 // RB-2.2: 2.2.10 #define NATRON_VERSION_MAJOR_22 2 diff --git a/LATEST_VERSION_README.txt b/LATEST_VERSION_README.txt index 722c6ead69..cb428d6cba 100644 --- a/LATEST_VERSION_README.txt +++ b/LATEST_VERSION_README.txt @@ -1,4 +1,4 @@ -The Natron version number (eg 2.3.15) appears in: +The Natron version number (eg 2.3.16) appears in: - Documentation/source/conf.py in variables version and release - App/App.pro in variable VERSION diff --git a/Natron.spec b/Natron.spec index 1dc8f6b547..7752266389 100644 --- a/Natron.spec +++ b/Natron.spec @@ -3,7 +3,7 @@ Name: Natron # The two actively maintained versions (that are merged into master) Version21: 2.1.10 Version22: 2.2.10 -Version23: 2.3.15 +Version23: 2.3.16 Version30: 3.0.0 # The version for this branch of the sources