diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-19 10:10:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-19 10:11:13 +0100 |
| commit | 285cf7a1a6cb660b57cbc75f63e49736b51d705e (patch) | |
| tree | 28118ab1913f7e4d0093be8750a8246ea3244e58 /src/main.h | |
| parent | 636a42bd0e208d1d49dab6a95e23863736823883 (diff) | |
| parent | c3a7f516e7ba9f39537ded149d8eb756c836fa2e (diff) | |
| download | bitcoin-285cf7a1a6cb660b57cbc75f63e49736b51d705e.tar.xz | |
Merge pull request #3412
c3a7f51 Move `verifymessage` from rpcwallet to rpcmisc (Wladimir J. van der Laan)
723a03d Move `createmultisig` from rpcwallet to rpcmisc (Wladimir J. van der Laan)
452955f Move `validateaddress` from rpcwallet to rpcmisc (Wladimir J. van der Laan)
cd7fa8b Move `nTransactionFee` from main.cpp to wallet.cpp (Wladimir J. van der Laan)
a943bde Move `settxfee` from rpcblockchain to rpcwallet (Wladimir J. van der Laan)
16bc9aa Move `getinfo` from rpcnet to rpcmisc (Wladimir J. van der Laan)
652e156 add new RPC implementation file `rpcmisc.cpp` (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index fd5e352cb6..f3f9acb639 100644 --- a/src/main.h +++ b/src/main.h @@ -96,9 +96,6 @@ extern bool fTxIndex; extern unsigned int nCoinCacheSize; extern bool fHaveGUI; -// Settings -extern int64_t nTransactionFee; - // Minimum disk space required - used in CheckDiskSpace() static const uint64_t nMinDiskSpace = 52428800; |