ANON Ready, Checkpointed, Version Bumped to 2.0.6, Immediate Hard-For…

…k Update!
sherlockcoin · Mar 11, 2015 · b288c98 · b288c98
1 parent 7859e48
commit b288c98
Show file tree

Hide file tree

Showing 170 changed files with 2,671 additions and 1,246 deletions.
diff --git a/contrib/gitian-downloader/sunnyking-key.gpg~ b/contrib/gitian-downloader/sunnyking-key.gpg~
diff --git a/doc/Thumbs.db b/doc/Thumbs.db
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -62,6 +62,7 @@ namespace Checkpoints
 		( 224176, CheckBlock35 )
 		( 419892, CheckBlock36 )
 		( 681958, CheckBlock37 )
+		(1016236, CheckBlock38 )
     ;
 
     // TestNet has no checkpoints

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       2
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    5
+#define CLIENT_VERSION_REVISION    6
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/leveldb/db/autocompact_test.cc b/src/leveldb/db/autocompact_test.cc
diff --git a/src/leveldb/issues/issue178_test.cc b/src/leveldb/issues/issue178_test.cc
diff --git a/src/leveldb/issues/issue200_test.cc b/src/leveldb/issues/issue200_test.cc
diff --git a/src/leveldb/.gitignore → src/leveldb/leveldb/.gitignore b/src/leveldb/.gitignore → src/leveldb/leveldb/.gitignore
@@ -6,7 +6,6 @@ build_config.mk
 *.so.*
 *_test
 db_bench
-leveldbutil
 Release
 Debug
 Benchmark

diff --git a/src/leveldb/AUTHORS → src/leveldb/leveldb/AUTHORS b/src/leveldb/AUTHORS → src/leveldb/leveldb/AUTHORS
@@ -9,4 +9,3 @@ Sanjay Ghemawat <sanjay@google.com>
 
 # Partial list of contributors:
 Kevin Regan <kevin.d.regan@gmail.com>
-Johan Bilien <jobi@litl.com>
diff --git a/src/leveldb/LICENSE → src/leveldb/leveldb/LICENSE b/src/leveldb/LICENSE → src/leveldb/leveldb/LICENSE