Permalink
Browse files

Move Display Ver to Client Ver and bump client ver

  • Loading branch information...
Tranz5 committed Jul 19, 2014
1 parent fbec842 commit 3e9320576c3da629fd86bb9ca0ef36a6e3cb65cb
Showing with 5 additions and 10 deletions.
  1. +3 −3 src/clientversion.h
  2. +2 −2 src/version.cpp
  3. +0 −5 src/version.h
View
@@ -6,9 +6,9 @@
//
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 7
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 4
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build
View
@@ -50,9 +50,9 @@ const std::string CLIENT_NAME("HoboNickels");
#ifndef BUILD_DESC
# ifdef GIT_COMMIT_ID
# define BUILD_DESC BUILD_DESC_FROM_COMMIT(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION, DISPLAY_VERSION_BUILD, GIT_COMMIT_ID)
# define BUILD_DESC BUILD_DESC_FROM_COMMIT(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, GIT_COMMIT_ID)
# else
# define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION, DISPLAY_VERSION_BUILD)
# define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD)
# endif
#endif
View
@@ -44,9 +44,4 @@ static const int BIP0031_VERSION = 60000;
// "mempool" command, enhanced "getdata" behavior starts with this version:
static const int MEMPOOL_GD_VERSION = 60002;
#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 4
#define DISPLAY_VERSION_REVISION 0
#define DISPLAY_VERSION_BUILD 1
#endif

0 comments on commit 3e93205

Please sign in to comment.