ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin into serialize

Browse Source 
Conflicts:
	src/LedgerFormats.cpp
	src/SerializedLedger.cpp
	src/Version.h

Merge with master
This commit is contained in:
JoelKatz
2012-09-28 19:22:30 -07:00
parent ebf3aeee64 40b5189209
commit cfa0f129d9
9 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Version.h
View File

@@ -16,11 +16,11 @@
// Version we prefer to speak:
#define PROTO_VERSION_MAJOR 1
#define PROTO_VERSION_MINOR 0
#define PROTO_VERSION_MINOR 1
// Version we will speak to:
#define MIN_PROTO_MAJOR 1
#define MIN_PROTO_MINOR 0
#define MIN_PROTO_MINOR 1
#define MAKE_VERSION_INT(maj,min) ((maj << 16) | min)
#define GET_VERSION_MAJOR(ver) (ver >> 16)