Merge remote-tracking branch 'refs/remotes/origin/v0.12.0.x'

AdvancedTechnologyCoin · Sep 28, 2016 · 71385cb · 71385cb
2 parents bda3f33 + e9582eb
commit 71385cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 12)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 61)
+define(_CLIENT_VERSION_BUILD, 62)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2016)
 AC_INIT([Arctic Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@arcticcoin.org],[arcticcoin])

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -65,12 +65,13 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
 		(20438, uint256("0x0000000001b202c01a581ad8eed84c24da9b1e9a7a1ce99f585d0560016878ec"))
 		(27194, uint256("0x000000000df23b42705c16276be267e784a678586134c1910db86c8735f8192f"))		
 		(27790, uint256("0x0000000014a380900941cdf4d79c53b82dd5d557041dc219abe404b022859385"))
+		(28472, uint256("0x00000000183f960efd87642792d29d86fd15296bd1cf3d5ab23ce6eefe999fb6"))
 
         ;
 static const Checkpoints::CCheckpointData data = {
         &mapCheckpoints,
-        1474931053, // * UNIX timestamp of last checkpoint block
-        29220,      // * total number of transactions between genesis and last checkpoint
+        1475037863, // * UNIX timestamp of last checkpoint block
+        29911,      // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
         2800        // * estimated number of transactions per day after checkpoint
     };

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 12
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 61
+#define CLIENT_VERSION_BUILD 62
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true