diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-03-11 11:20:07 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-03-11 11:20:07 -0400 |
| commit | 669264c176da0bb46465596b626353af348047bf (patch) | |
| tree | f286e417bd951e15b9ec899bccc06b23936f94fc /src/main.cpp | |
| parent | 1264b3647d48c61b033f5e3d20ffbb84ed77c369 (diff) | |
| parent | 037b4f1485404a69f96ac6c448a97d21315c8663 (diff) | |
Merge branch 'match_relay_fee' of git://github.com/mikehearn/bitcoin
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 9fdd76101a..5f50e05780 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,7 +51,7 @@ unsigned int nCoinCacheSize = 5000; /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ int64_t CTransaction::nMinTxFee = 10000; // Override with -mintxfee -/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ +/** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */ int64_t CTransaction::nMinRelayTxFee = 1000; static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have |