aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-11-05 12:10:38 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-11-05 12:11:11 +0100
commit3694b74fa9c85e07ddbd3583154b38cd3b39f640 (patch)
treeb937124865bd063aa52152f4e1bb1eb6a30f025f /src/main.cpp
parent79456524f8f5b8a4e1313acbbacf214cf3e6ee5d (diff)
parent53238ff0b1085352e4aaa796d0e473551e573143 (diff)
downloadbitcoin-3694b74fa9c85e07ddbd3583154b38cd3b39f640.tar.xz
Merge pull request #6887
53238ff Clarify what minrelaytxfee does (MarcoFalke) abd8b76 [qt] Properly display required fee instead of minTxFee (MarcoFalke)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 26a22ae6fd..5a0406c771 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,7 @@ size_t nCoinCacheUsage = 5000 * 300;
uint64_t nPruneTarget = 0;
bool fAlerts = DEFAULT_ALERTS;
-/** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */
+/** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */
CFeeRate minRelayTxFee = CFeeRate(1000);
CTxMemPool mempool(::minRelayTxFee);