ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'continuousClose'

Browse Source 
Conflicts:
	src/LedgerAcquire.cpp
	src/NetworkOPs.h

Merge continuous ledger close into main branch. YAY!
This commit is contained in:
JoelKatz
2012-07-16 14:48:21 -07:00
parent 060772ad7d 659bb5af63
commit e89af2f784
35 changed files with 750 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Version.h
View File

@@ -4,11 +4,10 @@
// Versions
//
// Version of this software:
#define SERVER_VERSION_MAJOR 0
#define SERVER_VERSION_MINOR 1
#define SERVER_VERSION_SUB "-a"
#define SERVER_NAME "NewCoin"
#define SERVER_VERSION_MAJOR 0
#define SERVER_VERSION_MINOR 3
#define SERVER_VERSION_SUB "-a"
#define SERVER_NAME "NewCoin"
#define SV_STRINGIZE(x) SV_STRINGIZE2(x)
#define SV_STRINGIZE2(x) #x
@@ -17,11 +16,11 @@
// Version we prefer to speak:
#define PROTO_VERSION_MAJOR 0
#define PROTO_VERSION_MINOR 2
#define PROTO_VERSION_MINOR 3
// Version we wil speak to:
#define MIN_PROTO_MAJOR 0
#define MIN_PROTO_MINOR 2
#define MIN_PROTO_MINOR 3
#define MAKE_VERSION_INT(maj,min) ((maj << 16) | min)
#define GET_VERSION_MAJOR(ver) (ver >> 16)