aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-08-25 11:05:24 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-08-25 11:05:24 -0400
commitb9c078ea965867a7b201cdc1d5131fc6bc01fe14 (patch)
treef17841d2fac41ba03196af3a3838bb1f34a0ad2b /src
parent8f3f5540536f1c17d5df09595694363810842d46 (diff)
parent80cfc3a48551513d6133a2433b257c25727f8874 (diff)
downloadbitcoin-b9c078ea965867a7b201cdc1d5131fc6bc01fe14.tar.xz
Merge branch 'checkpoint'
Diffstat (limited to 'src')
-rw-r--r--src/checkpoints.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 2df647e83d..8208854962 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -29,7 +29,7 @@ namespace Checkpoints
(105000, uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97"))
(134444, uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe"))
(168000, uint256("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763"))
- (185333, uint256("0x00000000000002334c71b8706940c20348af897a9cfc0f1a6dab0d14d4ceb815"))
+ (193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317"))
;
static MapCheckpoints mapCheckpointsTestnet =