aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2011-12-16 17:58:40 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2011-12-16 17:58:40 -0500
commit7aa253d3ec746c3d4ddbd55fab55d0eff28294f8 (patch)
treec89f628867ba8d877dbe9c5375b20a81df53b8c7
parent9ea06992789a0072c167a9a8063e867bb4c43c00 (diff)
downloadbitcoin-7aa253d3ec746c3d4ddbd55fab55d0eff28294f8.tar.xz
Bump version to 0.5.2
-rw-r--r--bitcoin-qt.pro2
-rw-r--r--contrib/debian/changelog6
-rw-r--r--doc/README2
-rw-r--r--doc/README_windows.txt2
-rw-r--r--share/setup.nsi6
-rw-r--r--src/serialize.h2
6 files changed, 13 insertions, 7 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 66b53c2367..d7ac62e90a 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET =
-VERSION = 0.5.1
+VERSION = 0.5.2
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index b7992f729f..4510641825 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+bitcoin (0.5.2-natty0) natty; urgency=low
+
+ * New upstream release.
+
+ -- Luke Dashjr <luke+bitcoin+deb@dashjr.org> Fri, 16 Dec 2011 17:57:00 -0500
+
bitcoin (0.5.1-natty0) natty; urgency=low
* New upstream release.
diff --git a/doc/README b/doc/README
index 5e0f8ee1ed..07785655f2 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.5.1 BETA
+Bitcoin 0.5.2 BETA
Copyright (c) 2009-2011 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 d237615f57..b98f878b27 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.5.1 BETA
+Bitcoin 0.5.2 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/share/setup.nsi b/share/setup.nsi
index 0c0fa048af..abf5c566b5 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.5.1
+!define VERSION 0.5.2
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@@ -45,13 +45,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.5.1-win32-setup.exe
+OutFile bitcoin-0.5.2-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.5.1.0
+VIProductVersion 0.5.2.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/serialize.h b/src/serialize.h
index 78cff43d53..388e655970 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -60,7 +60,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 50100;
+static const int VERSION = 50200;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;