diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-25 16:51:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-25 17:00:09 +0200 |
| commit | 343feecf562a39e7d898ece2fd745fcb9d4c90e9 (patch) | |
| tree | f780cbfe1b73ae0765d1930595e59cf7b13b53d6 /src/qt/bitcoin.cpp | |
| parent | Merge pull request #3839 (diff) | |
| parent | Move coins.cpp and keystore.cpp to libbitcoin_common (diff) | |
| download | discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.tar.xz discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.zip | |
Merge pull request #4368
75c82d4 Move coins.cpp and keystore.cpp to libbitcoin_common (Wladimir J. van der Laan)
84ce18c Remove unnecessary dependencies for bitcoin-cli (Wladimir J. van der Laan)
14f888c Move network-time related functions to timedata.cpp/h (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 76dddb103..89305e9f3 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -546,7 +546,7 @@ int main(int argc, char *argv[]) if (!PaymentServer::ipcParseCommandLine(argc, argv)) exit(0); #endif - bool isaTestNet = Params().NetworkID() != CChainParams::MAIN; + bool isaTestNet = Params().NetworkID() != CBaseChainParams::MAIN; // Allow for separate UI settings for testnets if (isaTestNet) QApplication::setApplicationName(QAPP_APP_NAME_TESTNET); |