aboutsummaryrefslogtreecommitdiff
path: root/serialize.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2010-11-22 11:34:13 -0500
committerGavin Andresen <gavinandresen@gmail.com>2010-11-22 11:34:13 -0500
commit262430f705501011dfada435dd1a9240e5311819 (patch)
treed1e0fcc65c3563b530c9bc47baca2aff2ff4f853 /serialize.h
parent593f74b9cbaabc3952d0491d502c0405659121c3 (diff)
parente4ff4e6898d378b1a3e83791034a7af455fde3ab (diff)
downloadbitcoin-262430f705501011dfada435dd1a9240e5311819.tar.xz
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'serialize.h')
-rw-r--r--serialize.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/serialize.h b/serialize.h
index 05d7303058..dde2aeb9a1 100644
--- a/serialize.h
+++ b/serialize.h
@@ -22,7 +22,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 31505;
+static const int VERSION = 31600;
static const char* pszSubVer = "";