diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-01-28 11:08:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-01-28 11:28:24 +0100 |
| commit | 62f2d769e45043c1f262ed45babb70fe237ad2bb (patch) | |
| tree | 23fc429dc67fc4455d108a5f727e50dbb9571604 /src/bitcoind.cpp | |
| parent | Merge #7425: devtools: Fix utf-8 support in messages for github-merge (diff) | |
| parent | rpc: update inline comments to refer to new file paths (diff) | |
| download | discoin-62f2d769e45043c1f262ed45babb70fe237ad2bb.tar.xz discoin-62f2d769e45043c1f262ed45babb70fe237ad2bb.zip | |
Merge #7348: MOVE ONLY: move rpc* to rpc/
d13f65e rpc: update inline comments to refer to new file paths (Daniel Cousens)
a0eaff8 move rpc* to rpc/ (Daniel Cousens)
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 3b6608c95..d1fd56d17 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -5,14 +5,13 @@ #include "chainparams.h" #include "clientversion.h" -#include "rpcserver.h" +#include "rpc/server.h" #include "init.h" #include "noui.h" #include "scheduler.h" #include "util.h" #include "httpserver.h" #include "httprpc.h" -#include "rpcserver.h" #include <boost/algorithm/string/predicate.hpp> #include <boost/filesystem.hpp> |