aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-21 16:47:16 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-21 16:47:16 +0000
commit2ce73dbe8546b0bfb5e512a6b11e201871374147 (patch)
tree6dc568714503d7dc84f97916cc6361aa1c00b29f
parentd9c6b09ac42d21abd151a0feaff676b8a8a24bb9 (diff)
-- version 0.3.14 releasev0.3.14
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@171 1a98c847-1fd6-4fd8-948a-caf3550aa51b
-rw-r--r--main.cpp2
-rw-r--r--serialize.h2
-rw-r--r--setup.nsi6
3 files changed, 5 insertions, 5 deletions
diff --git a/main.cpp b/main.cpp
index 2d950eefb5..764ddaac02 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2987,7 +2987,7 @@ void BitcoinMiner()
txNew.vin.resize(1);
txNew.vin[0].prevout.SetNull();
int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
- if (nNow > nPrevTime+1 && ++nExtraNonce >= 0x7f)
+ if (++nExtraNonce >= 0x7f && nNow > nPrevTime+1)
{
nExtraNonce = 1;
nPrevTime = nNow;
diff --git a/serialize.h b/serialize.h
index 0268c750b9..3a8d621554 100644
--- a/serialize.h
+++ b/serialize.h
@@ -22,7 +22,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 31306;
+static const int VERSION = 31400;
static const char* pszSubVer = "";
diff --git a/setup.nsi b/setup.nsi
index 32ea5dd5bf..5873b075c3 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -7,7 +7,7 @@ RequestExecutionLevel highest
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.13
+!define VERSION 0.3.14
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@@ -42,12 +42,12 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.3.13-win32-setup.exe
+OutFile bitcoin-0.3.14-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
ShowInstDetails show
-VIProductVersion 0.3.13.0
+VIProductVersion 0.3.14.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"