diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-13 10:46:31 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-13 10:46:31 -0400 |
commit | 43e4a2a28908facf4f372f51fac2d8d564ded906 (patch) | |
tree | 10aa174c925dbca952eadd483460c1d9aeb2c5f3 | |
parent | 41016bfc46b70aace013ffd29143a27bc7288e48 (diff) | |
parent | fdbf76d4f49c220e2ed4412a3d8d8cd6efd74826 (diff) | |
download | bitcoin-43e4a2a28908facf4f372f51fac2d8d564ded906.tar.xz |
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r-- | db.cpp | 1 | ||||
-rw-r--r-- | serialize.h | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -77,7 +77,6 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL) DB_INIT_MPOOL | DB_INIT_TXN | DB_THREAD | - DB_PRIVATE | DB_RECOVER, S_IRUSR | S_IWUSR); if (ret > 0) diff --git a/serialize.h b/serialize.h index 712d6c5305..6c636e1b8b 100644 --- a/serialize.h +++ b/serialize.h @@ -23,7 +23,7 @@ class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; static const int VERSION = 312; -static const char* pszSubVer = ".3"; +static const char* pszSubVer = ".4"; |