diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:08:53 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:08:53 -0500 |
| commit | ab4b52a23912fb6bd4eabd0fd035858e8ad3a815 (patch) | |
| tree | e390a050e611fe5659cd5bc70cb45205419cf1a3 /src/main.cpp | |
| parent | 96f1723bb1f4155357b4e33988a2b99ee674c549 (diff) | |
| parent | 027d149352bc25f0f37363da95a0b4c723100f63 (diff) | |
| download | bitcoin-ab4b52a23912fb6bd4eabd0fd035858e8ad3a815.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
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 a7871fcc16..f21af90473 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2828,7 +2828,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) // Transaction fee required depends on block size bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority)); - int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true); + int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree); // Connecting shouldn't fail due to dependency on other memory pool transactions // because we're already processing them in order of dependency |