Bump version numbers for 0.6.1rc1

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 5d359c0..a157f41 100644 (file)
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET =
-VERSION = 0.6.0
+VERSION = 0.6.1
 INCLUDEPATH += src src/json src/qt
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB
 CONFIG += no_include_pwd

diff --git a/doc/README b/doc/README
index 00694e2..aa89960 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.6.0 BETA
+Bitcoin 0.6.1rc1 BETA
 
 Copyright (c) 2009-2012 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying

diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 9aa5aa7..6b48b1d 100644 (file)
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.6.0 BETA\r
+Bitcoin 0.6.1rc1 BETA\r
 \r
 Copyright (c) 2009-2012 Bitcoin Developers\r
 Distributed under the MIT/X11 software license, see the accompanying\r

diff --git a/doc/release-process.txt b/doc/release-process.txt
index 3f3c6da..a1b0250 100644 (file)
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -2,7 +2,7 @@
 
 * update (commit) version in sources
   bitcoin-qt.pro
-  src/version.cpp
+  src/version.h
   share/setup.nsi
   doc/README*
 

diff --git a/share/setup.nsi b/share/setup.nsi
index 4dc2ad5..fa33bd9 100644 (file)
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 \r
 # General Symbol Definitions\r
 !define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.6.0\r
+!define VERSION 0.6.1\r
 !define COMPANY "Bitcoin project"\r
 !define URL http://www.bitcoin.org/\r
 \r
@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English\r
 \r
 # Installer attributes\r
-OutFile bitcoin-0.6.0-win32-setup.exe\r
+OutFile bitcoin-0.6.1rc1-win32-setup.exe\r
 InstallDir $PROGRAMFILES\Bitcoin\r
 CRCCheck on\r
 XPStyle on\r
 BrandingText " "\r
 ShowInstDetails show\r
-VIProductVersion 0.6.0.99\r
+VIProductVersion 0.6.1.1\r
 VIAddVersionKey ProductName Bitcoin\r
 VIAddVersionKey ProductVersion "${VERSION}"\r
 VIAddVersionKey CompanyName "${COMPANY}"\r

diff --git a/src/obj/nogui/.gitignore b/src/obj/nogui/.gitignore
deleted file mode 100644 (file)
index d6b7ef3..0000000
--- a/src/obj/nogui/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

diff --git a/src/obj/test/.gitignore b/src/obj/test/.gitignore
deleted file mode 100644 (file)
index d6b7ef3..0000000
--- a/src/obj/test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

diff --git a/src/version.h b/src/version.h
index f63b1bd..e8d5b5c 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -12,8 +12,8 @@
 
 static const int CLIENT_VERSION_MAJOR       =  0;
 static const int CLIENT_VERSION_MINOR       =  6;
-static const int CLIENT_VERSION_REVISION    =  0;
-static const int CLIENT_VERSION_BUILD       = 99;
+static const int CLIENT_VERSION_REVISION    =  1;
+static const int CLIENT_VERSION_BUILD       = 1;
 
 static const int CLIENT_VERSION =
                            1000000 * CLIENT_VERSION_MAJOR