From ce5b05067966a673e0d6b3867c16f2da357525d0 Mon Sep 17 00:00:00 2001 From: pacificao Date: Mon, 1 Jan 2018 22:19:21 +0000 Subject: [PATCH] rc1. --- Enviromint-qt.pro.user | 261 --------------------------------- Enviromint-qt.pro.user.2.1pre1 | 113 -------------- src/main.cpp | 4 +- 3 files changed, 2 insertions(+), 376 deletions(-) delete mode 100644 Enviromint-qt.pro.user delete mode 100644 Enviromint-qt.pro.user.2.1pre1 diff --git a/Enviromint-qt.pro.user b/Enviromint-qt.pro.user deleted file mode 100644 index 75fbd8e..0000000 --- a/Enviromint-qt.pro.user +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - EnvironmentId - {d32dd623-aa09-4391-a8b0-ce3aded51be0} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - System - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {3df3c7cb-2c5c-4651-89fa-1e245de47fea} - 0 - 0 - 0 - - C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop - - - true - qmake - qmake - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - Make - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - Make - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - false - - - C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop - - - true - qmake - qmake - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - Make - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Make - Make - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - No deployment - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/Enviromint-qt.pro.user.2.1pre1 b/Enviromint-qt.pro.user.2.1pre1 deleted file mode 100644 index bda1a44..0000000 --- a/Enviromint-qt.pro.user.2.1pre1 +++ /dev/null @@ -1,113 +0,0 @@ - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop - 2 - 202 - false - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop - 2 - 202 - true - - 2 - - Enviromint-qt - Qt4ProjectManager.Qt4RunConfiguration - 2 - - Enviromint-qt.pro - false - false - - false - false - - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 4 - - diff --git a/src/main.cpp b/src/main.cpp index e8a9980..3cd7a23 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2534,7 +2534,7 @@ bool LoadBlockIndex(bool fAllowNew) const char* pszTimestamp = "Eminem’s Daughter Is 22, And We’re All Frickin’ Old, BuzzFeed 123117"; CTransaction txNew; - txNew.nTime = 1514764801; + txNew.nTime = 1458855606; txNew.vin.resize(1); txNew.vout.resize(1); txNew.vin[0].scriptSig = CScript() << 0 << CBigNum(42) << vector((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); @@ -2544,7 +2544,7 @@ bool LoadBlockIndex(bool fAllowNew) block.hashPrevBlock = 0; block.hashMerkleRoot = block.BuildMerkleTree(); block.nVersion = 1; - block.nTime = 1514764801; + block.nTime = 1458855606; block.nBits = bnProofOfWorkLimit.GetCompact(); block.nNonce = !fTestNet ? 166149 : 0;