diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:05:54 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:05:54 -0400 |
| commit | 79fc752b6104b796aa5e0a8a8b6d2822fb0f3299 (patch) | |
| tree | 7ae039ced8787d0fe10e1150f3dcf249524c6a4c /src/main.h | |
| parent | fdcafa35359b3ad9af79d2367a1884d01607fb84 (diff) | |
| parent | 8460185dec74383b1e49500683cfc7aa9ceba554 (diff) | |
| download | bitcoin-79fc752b6104b796aa5e0a8a8b6d2822fb0f3299.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/keystore.h
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index e400bd96ab..70d83b90e0 100644 --- a/src/main.h +++ b/src/main.h @@ -578,9 +578,11 @@ public: // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01 if (nMinFee < nBaseFee) + { BOOST_FOREACH(const CTxOut& txout, vout) if (txout.nValue < CENT) nMinFee = nBaseFee; + } // Raise the price as the block approaches full if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2) |