Merge branch 'release' into develop
This commit is contained in:
commit
f074ea9b8a
2 changed files with 2 additions and 2 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 060a51f939b79c744c1e67ef328fe56fcacc993d
|
||||
Subproject commit 0d3831a3e4c13ab3016aca26d40d01f9e87c7282
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
#define PROJECT_REVISION "0"
|
||||
#define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
|
||||
|
||||
#define PROJECT_VERSION_BUILD_NO 117
|
||||
#define PROJECT_VERSION_BUILD_NO 118
|
||||
#define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
|
||||
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue