neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into devel-0.9

Browse Source
This commit is contained in:
vertoe 2015-01-01 19:02:51 +01:00
commit bb31919f9c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gitian-descriptors/gitian-win.yml
View File

@ -83,7 +83,7 @@ script: |
make $MAKEOPTS make $MAKEOPTS
make deploy make deploy
make install-strip make install-strip
cp -f darkcoin-*setup*.exe $BINDIR/ #cp -f darkcoin-*setup*.exe $BINDIR/
unset LD_PRELOAD unset LD_PRELOAD
unset FAKETIME unset FAKETIME
done # for BITS in done # for BITS in

2
src/clientversion.h
View File

@ -13,7 +13,7 @@
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 1
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true #define CLIENT_VERSION_IS_RELEASE true

2
src/main.cpp
View File

@ -1588,7 +1588,7 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockH
unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock) unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock)
{ {
uint retarget = DIFF_DGW; unsigned int retarget = DIFF_DGW;
if (!TestNet()) { if (!TestNet()) {
if (pindexLast->nHeight + 1 >= 34140) retarget = DIFF_DGW; if (pindexLast->nHeight + 1 >= 34140) retarget = DIFF_DGW;

2
src/version.h
View File

@ -33,7 +33,7 @@ static const int PROTOCOL_VERSION = 70052;
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;
// disconnect from peers older than this proto version // disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70052; //70046 static const int MIN_PEER_PROTO_VERSION = 70046
// nTime field added to CAddress, starting with this version; // nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this // if possible, avoid requesting addresses nodes older than this