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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 54ef85e7c3..cc40fe9749 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,9 +21,6 @@ set<CWallet*> setpwalletRegistered; CCriticalSection cs_main; -CCriticalSection cs_mapPubKeys; -map<uint160, vector<unsigned char> > mapPubKeys; - map<uint256, CTransaction> mapTransactions; CCriticalSection cs_mapTransactions; unsigned int nTransactionsUpdated = 0; |