-- version 0.3.14 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@171 1a98c847-1fd6-4fd8-948a-caf3550aa51b

diff --git a/main.cpp b/main.cpp
index 2d950ee..764ddaa 100644 (file)
--- 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 0268c75..3a8d621 100644 (file)
--- 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 32ea5dd..5873b07 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -7,7 +7,7 @@ RequestExecutionLevel highest
 \r
 # General Symbol Definitions\r
 !define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.3.13\r
+!define VERSION 0.3.14\r
 !define COMPANY "Bitcoin project"\r
 !define URL http://www.bitcoin.org/\r
 \r
@@ -42,12 +42,12 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English\r
 \r
 # Installer attributes\r
-OutFile bitcoin-0.3.13-win32-setup.exe\r
+OutFile bitcoin-0.3.14-win32-setup.exe\r
 InstallDir $PROGRAMFILES\Bitcoin\r
 CRCCheck on\r
 XPStyle on\r
 ShowInstDetails show\r
-VIProductVersion 0.3.13.0\r
+VIProductVersion 0.3.14.0\r
 VIAddVersionKey ProductName Bitcoin\r
 VIAddVersionKey ProductVersion "${VERSION}"\r
 VIAddVersionKey CompanyName "${COMPANY}"\r