diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:33:03 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:33:03 +0000 |
| commit | 8ddc257a4b422aee2a0e58362f31fbd32301f12f (patch) | |
| tree | fb959be4432cd9d8eea9402de79890a7131e39f0 /src/main.cpp | |
| parent | 982f4fd301435e56bb959267a8f69ff793b10e26 (diff) | |
| parent | 448f6b3d9b6d598f6a3db7807934d10fe94d5a71 (diff) | |
| download | bitcoin-8ddc257a4b422aee2a0e58362f31fbd32301f12f.tar.xz | |
Merge branch '0.4.x' into 0.5.x
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 0e6830e465..c06eb88887 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -469,7 +469,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; @@ -957,7 +957,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; @@ -1192,7 +1192,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)) |