diff options
| author | Giel van Schijndel <[email protected]> | 2012-06-17 14:30:37 +0200 |
|---|---|---|
| committer | Giel van Schijndel <[email protected]> | 2012-06-17 14:30:37 +0200 |
| commit | 07368a9e3c60bbef8452501d34bb8d3688cbca13 (patch) | |
| tree | 963f2e56176451bfeb84e54d14bf726388407b7d /src/util.cpp | |
| parent | Use the QueueShutdown signal to stop accepting new RPC connections (diff) | |
| parent | Document how to build/run unit tests (diff) | |
| download | discoin-07368a9e3c60bbef8452501d34bb8d3688cbca13.tar.xz discoin-07368a9e3c60bbef8452501d34bb8d3688cbca13.zip | |
Merge branch 'master' into async-ipv6-rpc
Conflicts:
src/bitcoinrpc.cpp
Signed-off-by: Giel van Schijndel <[email protected]>
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 3ab30baff..b07c9c1b7 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -834,7 +834,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) path = GetDefaultDataDir(); } if (fNetSpecific && GetBoolArg("-testnet", false)) - path /= "testnet"; + path /= "testnet3"; fs::create_directory(path); |