aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-04-02 10:03:26 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-04-02 10:03:26 -0400
commitf3da2a88c92a68c6ed1b0eeec16a3a7c35e3742e (patch)
treedfc464f74ae9c3b2a1c4b88b53ac0f5e297205ff
parenta1c3d8f14dca6a86fa103d86ef125e95372f860c (diff)
downloadbitcoin-f3da2a88c92a68c6ed1b0eeec16a3a7c35e3742e.tar.xz
Bump version to 0.6.0.99 for 0.6.1 merge window
-rw-r--r--share/setup.nsi2
-rw-r--r--src/main.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/setup.nsi b/share/setup.nsi
index cc19daf84a..4dc2ad5f05 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -51,7 +51,7 @@ CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.6.0.6
+VIProductVersion 0.6.0.99
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/main.h b/src/main.h
index 18d5dbdd74..16159e18b5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -26,7 +26,7 @@ class CInv;
class CRequestTracker;
class CNode;
-static const int CLIENT_VERSION = 60006;
+static const int CLIENT_VERSION = 60099;
static const bool VERSION_IS_BETA = true;
extern const std::string CLIENT_NAME;