Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 17 Feb 2012 18:48:01 +0000 (13:48 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 17 Feb 2012 18:48:01 +0000 (13:48 -0500)
commit0a6b081ccaafb57f98098437ee52f7a14b924062
tree9a4deace8453a5794dff4340825be4153b63439a
parent25bc37f8a23487386d96ed27d17f352497de64f2
parent0f8cb5db73e8ab06b779b3cf82e26986ccc7c3f8
Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git
src/bitcoinrpc.cpp
src/main.cpp