diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-24 18:06:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-24 18:12:56 +0100 |
| commit | 8d2fbfa49141172e1c63f5ab7b684a1f9e210571 (patch) | |
| tree | f8cc7e9b3268bea6b3333a9bc9f3a3f48eb87fbb /src/wallet/rpcwallet.cpp | |
| parent | 22cfe23196c5006d6dd79e1e1a24323148246bde (diff) | |
| parent | 8a893c949bf6b011c8ae1645888576bf236db79c (diff) | |
| download | bitcoin-8d2fbfa49141172e1c63f5ab7b684a1f9e210571.tar.xz | |
Merge pull request #5681
8a893c9 Includes: Do not include main.h from any other header (Jorge Timón)
eca0b1e Includes: MOVEONLY: move more method definitions out of wallet.h (Jorge Timón)
26c16d9 Includes: Refactor: Move CValidationInterface and CMainSignals out of main (Jorge Timón)
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5502b0b261..9318c1b2b1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6,10 +6,11 @@ #include "amount.h" #include "base58.h" #include "core_io.h" -#include "rpcserver.h" #include "init.h" +#include "main.h" #include "net.h" #include "netbase.h" +#include "rpcserver.h" #include "timedata.h" #include "util.h" #include "utilmoneystr.h" |