Skip to content

Commit

Permalink
bump version to 2.3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Apr 5, 2018
1 parent c806718 commit bbcf12b
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion App/App.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
VERSION_23 = 2.3.11
VERSION_30 = 3.0.0

# The version for this branch
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# History


## Version 2.3.11


## Version 2.3.10

- Add "Overwrite" checkbox to writers to avoid re-rendering the whole sequence #1683.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.10'
version_23 = '2.3.11'
version_30 = '3.0.0'

# The version for this branch
Expand Down
2 changes: 1 addition & 1 deletion Documentation/source/devel/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.10'
version_23 = '2.3.11'
version_30 = '3.0.0'

# The version for this branch
Expand Down
2 changes: 1 addition & 1 deletion Documentation/source/guide/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.10'
version_23 = '2.3.11'
version_30 = '3.0.0'

# The version for this branch
Expand Down
4 changes: 2 additions & 2 deletions Global/Macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ namespace NATRON_PYTHON_NAMESPACE { }
#define NATRON_VERSION_MINOR_30 0
#define NATRON_VERSION_REVISION_30 0

// RB-2: 2.3.10
// RB-2: 2.3.11
#define NATRON_VERSION_MAJOR_23 2
#define NATRON_VERSION_MINOR_23 3
#define NATRON_VERSION_REVISION_23 10
#define NATRON_VERSION_REVISION_23 11

// RB-2.2: 2.2.10
#define NATRON_VERSION_MAJOR_22 2
Expand Down
2 changes: 1 addition & 1 deletion LATEST_VERSION_README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The Natron version number (eg 2.3.10) appears in:
The Natron version number (eg 2.3.11) appears in:

- Documentation/source/conf.py in variables version and release
- App/App.pro in variable VERSION
Expand Down
2 changes: 1 addition & 1 deletion Natron.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Version23: 2.3.11
Version30: 3.0.0

# The version for this branch of the sources
Expand Down

0 comments on commit bbcf12b

Please sign in to comment.