Merge branch 'master' of github.com:novacoin-project/novacoin

diff --git a/src/clientversion.h b/src/clientversion.h
index a50cfcf..c86ac7c 100644 (file)
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       7
 #define CLIENT_VERSION_REVISION    6
-#define CLIENT_VERSION_BUILD       7
+#define CLIENT_VERSION_BUILD       8
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/version.h b/src/version.h
index 9afa2a9..f182691 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70507;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60017;
+static const int PROTOCOL_VERSION = 60018;
 
 // earlier versions not supported as of Feb 2012, and are disconnected
 static const int MIN_PROTO_VERSION = 209;
@@ -45,6 +45,6 @@ static const int NOBLKS_VERSION_END = 60006;
 
 #define DISPLAY_VERSION_MAJOR       0
 #define DISPLAY_VERSION_MINOR       5
-#define DISPLAY_VERSION_REVISION    7
+#define DISPLAY_VERSION_REVISION    8
 
 #endif