diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:32:36 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:32:36 +0000 |
| commit | c6911a9755ef8daf7b9ae7d277c78ebf8e25b230 (patch) | |
| tree | 70fc4b026a6bb78f6d152678dfb1092d5914754e /src/main.cpp | |
| parent | 2857d51fea8a982e2229a4d7b36f56b2d24bf011 (diff) | |
| parent | f1a9aad7893173b0351ad32e684dad6f31598210 (diff) | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/bitcoinrpc.cpp
src/crypter.h
src/main.cpp
src/qt/bitcoin.cpp
src/qt/qtipcserver.cpp
src/util.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1dcc4ad5fc..6ab9087339 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3461,7 +3461,6 @@ public: CBlock* CreateNewBlock(CReserveKey& reservekey) { - // Create new block auto_ptr<CBlock> pblock(new CBlock()); if (!pblock.get()) |