diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-18 09:49:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-18 09:50:07 +0100 |
| commit | 7f8e90da335e851b8ec11e994a7da729ac73ef68 (patch) | |
| tree | 8d08576e753c0c79a3dddac32d5da4855fe330fe | |
| parent | f3ea48ad8b85125b786fb31584107e262abb7985 (diff) | |
| parent | 013a364138f7d318998643af1bbc749dc8c5a29c (diff) | |
| download | bitcoin-7f8e90da335e851b8ec11e994a7da729ac73ef68.tar.xz | |
Merge pull request #7030
013a364 [contrib] Delete test-patches (MarcoFalke)
| -rw-r--r-- | contrib/test-patches/README.md | 7 | ||||
| -rw-r--r-- | contrib/test-patches/temp-revert-2.patch | 20 |
2 files changed, 0 insertions, 27 deletions
diff --git a/contrib/test-patches/README.md b/contrib/test-patches/README.md deleted file mode 100644 index def40b0d6c..0000000000 --- a/contrib/test-patches/README.md +++ /dev/null @@ -1,7 +0,0 @@ -### Test Patches ### - -These patches are applied when the automated pull-tester -tests each pull and when master is tested using jenkins. -You can find more information about the tests run at -[http://jenkins.bluematt.me/pull-tester/files/ -](http://jenkins.bluematt.me/pull-tester/files/)
\ No newline at end of file diff --git a/contrib/test-patches/temp-revert-2.patch b/contrib/test-patches/temp-revert-2.patch deleted file mode 100644 index 1cd043d0d7..0000000000 --- a/contrib/test-patches/temp-revert-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit cfae26916dba311f6f75d444301c1f9362267c3e -Author: Matt Corallo <git@bluematt.me> -Date: Sun Mar 24 20:45:50 2013 -0400 - - Revert "Checkpoint at first block in 11 March chain fork" - - This reverts commit f817c496a1482d05b22c8e539de67f07db1c09d9. - -diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp -index 62234b9..9b11f0b 100644 ---- a/src/checkpoints.cpp -+++ b/src/checkpoints.cpp -@@ -44,7 +44,6 @@ namespace Checkpoints - (193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) - (210000, uint256("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e")) - (216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) -- (225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) - ; - static const CCheckpointData data = { - &mapCheckpoints, |