bump version to 2.2.2

MrKepzie · Jan 24, 2017 · 7cc47d0 · 7cc47d0
1 parent a931244
commit 7cc47d0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/App/App.pro b/App/App.pro
@@ -20,7 +20,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.1
+VERSION_22 = 2.2.2
 VERSION_23 = 2.3
 VERSION_30 = 3.0.0
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,9 @@
 
 This is a bug-fix release
 
-- fix hue display in the viewer
-- EdgeBlur now has an optional Matte input used to compute the edges
+- fix hue display in the viewer #1554
+- EdgeBlur now has an optional Matte input used to compute the edges #1553
+- fix reading image sequences that do not have frame number 1 in them #1556
 
 ## Version 2.2.1
 

diff --git a/Documentation/source/conf.py b/Documentation/source/conf.py
@@ -50,7 +50,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.1'
+version_22 = '2.2.2'
 version_23 = '2.3'
 version_30 = '3.0'
 

diff --git a/Documentation/source/devel/conf.py b/Documentation/source/devel/conf.py
@@ -56,7 +56,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.1'
+version_22 = '2.2.2'
 version_23 = '2.3'
 version_30 = '3.0'
 

diff --git a/Documentation/source/guide/conf.py b/Documentation/source/guide/conf.py
@@ -50,7 +50,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.1'
+version_22 = '2.2.2'
 version_23 = '2.3'
 version_30 = '3.0'
 

diff --git a/Global/Macros.h b/Global/Macros.h
@@ -115,18 +115,22 @@ namespace NATRON_PYTHON_NAMESPACE { }
 //////////////////////////////////////////Natron version/////////////////////////////////////////////
 
 // The currently maintained Natron versions
+// RB-3: 3.0.0
 #define NATRON_VERSION_MAJOR_30 3
 #define NATRON_VERSION_MINOR_30 0
 #define NATRON_VERSION_REVISION_30 0
 
+// RB-2: 2.3.0
 #define NATRON_VERSION_MAJOR_23 2
 #define NATRON_VERSION_MINOR_23 3
 #define NATRON_VERSION_REVISION_23 0
 
+// RB-2.2: 2.2.2
 #define NATRON_VERSION_MAJOR_22 2
 #define NATRON_VERSION_MINOR_22 2
-#define NATRON_VERSION_REVISION_22 1
+#define NATRON_VERSION_REVISION_22 2
 
+// RB-2.1: 2.1.10
 #define NATRON_VERSION_MAJOR_21 2
 #define NATRON_VERSION_MINOR_21 1
 #define NATRON_VERSION_REVISION_21 10

diff --git a/LATEST_VERSION_README.txt b/LATEST_VERSION_README.txt
@@ -1,4 +1,4 @@
-The Natron version number (eg 2.2.1) appears in:
+The Natron version number (eg 2.2.2) 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
@@ -2,7 +2,7 @@ Summary: Open source compositing software
 Name: Natron
 # The two actively maintained versions (that are merged into master)
 Version21: 2.1.10
-Version22: 2.2.1
+Version22: 2.2.2
 Version23: 2.3
 Version30: 3.0.0