Mercurial > hg > bitcoin
changeset 290:3026ce829889 draft
-- version 0.3.14 release
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@171 1a98c847-1fd6-4fd8-948a-caf3550aa51b
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
|---|---|
| date | Thu, 21 Oct 2010 16:47:16 +0000 |
| parents | d108c66874ab |
| children | 30e6b272d5eb |
| files | main.cpp serialize.h setup.nsi |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/main.cpp +++ b/main.cpp @@ -2987,7 +2987,7 @@ 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;
--- a/serialize.h +++ b/serialize.h @@ -22,7 +22,7 @@ class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 31306; +static const int VERSION = 31400; static const char* pszSubVer = "";
--- a/setup.nsi +++ b/setup.nsi @@ -7,7 +7,7 @@ # 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 @@ !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}"