Merge pull request #1 from ArcticCore/v0.12.0.x

V0.12.0.x
AdvancedTechnologyCoin · Sep 25, 2016 · 45c1cd9 · 45c1cd9
2 parents c8f8484 + fae768f
commit 45c1cd9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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, 59)
+define(_CLIENT_VERSION_BUILD, 60)
 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
@@ -63,13 +63,13 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
 		(12863, uint256("0x00000000072e62711296c94e7687afda1cc8c7033550603bc3ae7c05bb11e887"))
 		(17971, uint256("0x000000000a9ae7a3540e9d1ed4434b6ffa5045b4a3d835144fc8e709ae040d59"))
 		(20438, uint256("0x0000000001b202c01a581ad8eed84c24da9b1e9a7a1ce99f585d0560016878ec"))
-
+		(27194, uint256("0x000000000df23b42705c16276be267e784a678586134c1910db86c8735f8192f"))		
 
         ;
 static const Checkpoints::CCheckpointData data = {
         &mapCheckpoints,
-        1473754755, // * UNIX timestamp of last checkpoint block
-        20438,      // * total number of transactions between genesis and last checkpoint
+        1474835401, // * UNIX timestamp of last checkpoint block
+        28612,      // * 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 59
+#define CLIENT_VERSION_BUILD 60
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true