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)
6 years ago · 0d219ccdcd
parent 95568639e0 2cab7ec917
commit 0d219ccdcd
3 changed files with 2 additions and 2 deletions
--- a/src/blocks/checkpoints.dat
+++ b/src/blocks/checkpoints.dat
--- 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;
--- 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