bump version to 2.3.5

MrKepzie · Dec 12, 2017 · ea5c9dc · ea5c9dc
1 parent c64f157
commit ea5c9dc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/App/App.pro b/App/App.pro
@@ -21,7 +21,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.4
+VERSION_23 = 2.3.5
 VERSION_30 = 3.0.0
 
 # The version for this branch

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 # History
 
 
+## Version 2.3.5
+
+### Plugins
+
+- DenoiseSharpen: fix a bug where the plugin would not abort processing when required.
+
+
 ## Version 2.3.4
 
 - Binaries distributed through Natron's web site are now built with 8-bit x264. 10-bit x264 (introduced with 2.2.6) causes too many compatibility issues. There are other codecs that support 10-bit output (especially ProRes, vc2, libopenjpeg, libvpx-vp9, and x265 on some systems). In order to get 10-bit x264, it is recommended to encode a quasi-lossless using one of these codecs, and then transcode with a ffmpeg binary capable of encoding 10-bit x264.
@@ -19,6 +26,7 @@
 - ColorCorrect: Fix wrong render for input values outside the [0-1] range #1703
 - ReadOIIO: Adjust Maximum Thr. (used when reading RAW camera files) should defaut to 0.0 #1705
 
+
 ## Version 2.3.3
 
 - Fix computation of remaining time when rendering.

diff --git 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.4'
+version_23 = '2.3.5'
 version_30 = '3.0.0'
 
 # The version for this branch

diff --git 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.4'
+version_23 = '2.3.5'
 version_30 = '3.0.0'
 
 # The version for this branch

diff --git 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.4'
+version_23 = '2.3.5'
 version_30 = '3.0.0'
 
 # The version for this branch

diff --git a/Global/Macros.h b/Global/Macros.h
@@ -120,10 +120,10 @@ namespace NATRON_PYTHON_NAMESPACE { }
 #define NATRON_VERSION_MINOR_30 0
 #define NATRON_VERSION_REVISION_30 0
 
-// RB-2: 2.3.4
+// RB-2: 2.3.5
 #define NATRON_VERSION_MAJOR_23 2
 #define NATRON_VERSION_MINOR_23 3
-#define NATRON_VERSION_REVISION_23 4
+#define NATRON_VERSION_REVISION_23 5
 
 // RB-2.2: 2.2.10
 #define NATRON_VERSION_MAJOR_22 2

diff --git a/LATEST_VERSION_README.txt b/LATEST_VERSION_README.txt
@@ -1,4 +1,4 @@
-The Natron version number (eg 2.3.4) appears in:
+The Natron version number (eg 2.3.5) 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
@@ -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.4
+Version23: 2.3.5
 Version30: 3.0.0
 
 # The version for this branch of the sources