diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-13 16:36:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-13 16:36:43 +0200 |
| commit | b1bdb4e5293d54da8625698e17fca934ee4dbdb9 (patch) | |
| tree | 77d581c0148d018489f88e27d23011d61b11c873 /src | |
| parent | Merge pull request #1442 (diff) | |
| parent | bump version (diff) | |
| download | monero-b1bdb4e5293d54da8625698e17fca934ee4dbdb9.tar.xz | |
Merge pull request #1437
655eafd1 bump version (Riccardo Spagni)
117194a3 update checkpoints (Riccardo Spagni)
39a9db9e update checkpoints (Riccardo Spagni)
Diffstat (limited to 'src')
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 36440036 -> 38400036 bytes | |||
| -rw-r--r-- | src/cryptonote_core/checkpoints.cpp | 3 | ||||
| -rw-r--r-- | src/version.h.in | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex 24cfffa38..a15f53e67 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp index 1d5959c46..dc1912856 100644 --- a/src/cryptonote_core/checkpoints.cpp +++ b/src/cryptonote_core/checkpoints.cpp @@ -186,6 +186,9 @@ namespace cryptonote ADD_CHECKPOINT(913193, "5292d5d56f6ba4de33a58d9a34d263e2cb3c6fee0aed2286fd4ac7f36d53c85f"); ADD_CHECKPOINT(1000000, "a886ef5149902d8342475fee9bb296341b891ac67c4842f47a833f23c00ed721"); ADD_CHECKPOINT(1100000, "3fd720c5c8b3072fc1ccda922dec1ef25f9ed88a1e6ad4103d0fe00b180a5903"); + ADD_CHECKPOINT(1150000, "1dd16f626d18e1e988490dfd06de5920e22629c972c58b4d8daddea0038627b2"); + ADD_CHECKPOINT(1200000, "fa7d13a90850882060479d100141ff84286599ae39c3277c8ea784393f882d1f"); + return true; } diff --git a/src/version.h.in b/src/version.h.in index c1eca54b8..43e046f24 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,4 +1,4 @@ #define MONERO_VERSION_TAG "@VERSIONTAG@" -#define MONERO_VERSION "0.10.0.0" +#define MONERO_VERSION "0.10.1.0" #define MONERO_RELEASE_NAME "Wolfram Warptangent" #define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG |