diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
| commit | 4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe (patch) | |
| tree | 449f4009f16f8897e7bdd37dafea4f4bd6e28e61 /src/main.cpp | |
| parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
| parent | 566f556c40069ed06c8b734433a2859f4917d242 (diff) | |
| download | bitcoin-4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index ac26fd7ff6..c30a2ecd4b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -567,7 +567,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to - // be annoying or make other's transactions take longer to confirm. + // be annoying or make others' transactions take longer to confirm. if (nFees < MIN_RELAY_TX_FEE) { static CCriticalSection cs; @@ -1064,7 +1064,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes } } - // Make sure all prevout.n's are valid: + // Make sure all prevout.n indexes are valid: for (unsigned int i = 0; i < vin.size(); i++) { const COutPoint prevout = vin[i].prevout; @@ -1299,7 +1299,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) // being sent to another address. // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information. // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool - // already refuses previously-known transaction id's entirely. + // already refuses previously-known transaction ids entirely. // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC. // On testnet it is enabled as of februari 20, 2012, 0:00 UTC. if (pindex->nTime > 1331769600 || (fTestNet && pindex->nTime > 1329696000)) |