diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-09-28 21:52:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-09-28 21:52:32 +0200 |
| commit | 002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0 (patch) | |
| tree | 58a16a226571a80537bfa7e3b1147aa4d0ee8767 /src/db.cpp | |
| parent | use median filter for peer-reported reported number of blocks (diff) | |
| parent | Merge pull request #536 from TheBlueMatt/build-updates (diff) | |
| download | discoin-002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0.tar.xz discoin-002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0.zip | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/db.cpp b/src/db.cpp index a22b17e34..f2363647a 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -822,7 +822,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) ssKey >> strKey; // Options -#ifndef GUI +#ifndef QT_GUI if (strKey == "fGenerateBitcoins") ssValue >> fGenerateBitcoins; #endif if (strKey == "nTransactionFee") ssValue >> nTransactionFee; |