diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-26 15:38:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-26 16:47:23 +0200 |
| commit | 491ad6db507776054c38230387f384991f42ad29 (patch) | |
| tree | 7d708a59cb5f61f9d970950c528889dec8fde8d5 /src/init.cpp | |
| parent | c0b892fee89cba7d1fda5fda2d2fc7e966643be1 (diff) | |
| parent | a9ba47101a46533ff0418d6868ebc9bf5c889818 (diff) | |
| download | bitcoin-491ad6db507776054c38230387f384991f42ad29.tar.xz | |
Merge remote branch 'upstream/master'
Conflicts:
src/bitcoinrpc.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index b69abb647a..fcb0c83340 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -424,7 +424,6 @@ bool AppInit2(int argc, char* argv[]) printf("mapBlockIndex.size() = %d\n", mapBlockIndex.size()); printf("nBestHeight = %d\n", nBestHeight); printf("setKeyPool.size() = %d\n", pwalletMain->setKeyPool.size()); - printf("mapPubKeys.size() = %d\n", mapPubKeys.size()); printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size()); printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size()); |