diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:14:59 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-27 19:14:59 +0000 |
| commit | f08ad34e0c7879d60d854c7014cc788e4268889f (patch) | |
| tree | 4d101e8f8ba21a29026d3992abda8f2348c1c707 /src/main.h | |
| parent | 802bc904ba102c19631aa2aad9659df74fe0e07e (diff) | |
| parent | d31e24aeaaf18a4117f23a937614a8bf2679e8a4 (diff) | |
| download | bitcoin-f08ad34e0c7879d60d854c7014cc788e4268889f.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 6f2a08422e..99b55528ae 100644 --- a/src/main.h +++ b/src/main.h @@ -26,7 +26,7 @@ class CInv; class CRequestTracker; class CNode; -static const int CLIENT_VERSION = 60009; +static const int CLIENT_VERSION = 60010; static const bool VERSION_IS_BETA = true; extern const std::string CLIENT_NAME; @@ -1565,7 +1565,7 @@ public: uint256 GetHash() const { - return SerializeHash(*this); + return Hash(this->vchMsg.begin(), this->vchMsg.end()); } bool IsInEffect() const |