Merge branch 'auxpow-0.19' into 0.19

Updated the BIP9 warning height in chain params for Namecoin's segwit activation height (see bitcoin/bitcoin#17449).
domob1812 · Nov 18, 2019 · 9b83b7d · 9b83b7d
2 parents 742d84d + 364b7c8
commit 9b83b7d
Show file tree

Hide file tree

Showing 4 changed files with 1,047 additions and 31 deletions.
diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h
@@ -5,7 +5,7 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Version Build */
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 /* Version is release */
 #define CLIENT_VERSION_IS_RELEASE true

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, 19)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)