1
0
Fork 0
forked from lthn/blockchain

Merge branch 'release' into develop

This commit is contained in:
cryptozoidberg 2021-04-30 13:12:02 -05:00
commit ca2cfe0c0f
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit e19aa811be78b8ff3a0b622bd889b11a2685bc0c
Subproject commit 060a51f939b79c744c1e67ef328fe56fcacc993d

View file

@ -4,10 +4,10 @@
#define BUILD_COMMIT_ID "@VERSION@"
#define PROJECT_MAJOR_VERSION "1"
#define PROJECT_MINOR_VERSION "1"
#define PROJECT_REVISION "8"
#define PROJECT_MINOR_VERSION "2"
#define PROJECT_REVISION "0"
#define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
#define PROJECT_VERSION_BUILD_NO 115
#define PROJECT_VERSION_BUILD_NO 117
#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 "]"