Skip to content

Commit

Permalink
Merge requests by lightsplasher adding total balance
Browse files Browse the repository at this point in the history
  • Loading branch information
joelao95 committed Oct 18, 2015
1 parent 371f484 commit 664a53e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion magi-qt.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = magi-qt
VERSION = 1.2.2.1
VERSION = 1.2.3.1
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 0
#define CLIENT_VERSION_BUILD 1

// Converts the parameter X to a string after macro replacement on X has been performed.
// Don't merge these into one macro!
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 2
#define DISPLAY_VERSION_REVISION 3
#define DISPLAY_VERSION_BUILD 0
#define DISPLAY_VERSION_BUILD 1

#endif

0 comments on commit 664a53e

Please sign in to comment.