Auto merge of #1303 - daira:z9-version-number, r=daira

Update version number and add release notes for z9.

refs #1290
This commit is contained in:
zkbot
2016-08-25 19:32:20 +00:00
5 changed files with 66 additions and 9 deletions

View File

@@ -148,10 +148,10 @@ public:
consensus.nMajorityWindow = 400;
consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.fPowAllowMinDifficultyBlocks = true;
pchMessageStart[0] = 0x18;
pchMessageStart[1] = 0x28;
pchMessageStart[2] = 0x38;
pchMessageStart[3] = 0x48;
pchMessageStart[0] = 0x26;
pchMessageStart[1] = 0xA7;
pchMessageStart[2] = 0x24;
pchMessageStart[3] = 0xB6;
vAlertPubKey = ParseHex("044e7a1553392325c871c5ace5d6ad73501c66f4c185d6b0453cf45dec5a1322e705c672ac1a27ef7cdaf588c10effdf50ed5f95f85f2f54a5f6159fca394ed0c6");
nDefaultPort = 18233;
nMinerThreads = 0;

View File

@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 0
#define CLIENT_VERSION_ZCASH 8
#define CLIENT_VERSION_ZCASH 9
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE false