diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-06-02 14:54:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-06-02 14:54:06 +0200 |
| commit | 0d219ccdcda36e1ce620a5a5e7ab820f85cba379 (patch) | |
| tree | 424b821c5c94700d8c36c130b69837d089472f49 | |
| parent | Merge pull request #3900 (diff) | |
| parent | remove -master from version string (diff) | |
| download | monero-0d219ccdcda36e1ce620a5a5e7ab820f85cba379.tar.xz | |
Merge pull request #3906
2cab7ec9 remove -master from version string (Riccardo Spagni)
e0cf1eca update checkpoints.dat for point release (Riccardo Spagni)
bfecf19c bump version for 0.12.2 point release (Riccardo Spagni)
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 197348 -> 198276 bytes | |||
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/version.cpp.in | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex 501a55673..085558504 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 3334f4983..dae0b9680 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4409,7 +4409,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "59261c03b54bcb21bd463f9fe40a94f40840a12642e9a3b3bfb11b35839a5fe3"; +static const char expected_block_hashes_hash[] = "0924bc1c47aae448321fde949554be192878dd800e6489379865218f84eacbca"; void Blockchain::load_compiled_in_block_hashes() { const bool testnet = m_nettype == TESTNET; diff --git a/src/version.cpp.in b/src/version.cpp.in index 9fed91d99..05a540a3f 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@" -#define DEF_MONERO_VERSION "0.12.1.0-master" +#define DEF_MONERO_VERSION "0.12.2.0" #define DEF_MONERO_RELEASE_NAME "Lithium Luna" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG |