Merge branch 'develop' into release
This commit is contained in:
commit
db1dedbb0a
2 changed files with 2 additions and 2 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 996579f83a182c9ca393ebd8f3cd9c986fb2c3d5
|
||||
Subproject commit 9be6a53f757a17403ea5798d08b577d450eb620a
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
#define PROJECT_REVISION "0"
|
||||
#define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
|
||||
|
||||
#define PROJECT_VERSION_BUILD_NO 316
|
||||
#define PROJECT_VERSION_BUILD_NO 317
|
||||
#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