Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 5 Oct 2011 14:38:10 +0000 (10:38 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 5 Oct 2011 14:38:10 +0000 (10:38 -0400)
commitb898c8fce687de9320bfae8dd2392e92c5464831
tree0eae81bd8a40703143a5bbe74ce6648ca0b143c7
parent8bc52d069247b3c7968bbb5c9ced9e6a7baa57e8
parent452506fc4153be072fe443fe3e3cbf76d9563a42
Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin
src/bitcoinrpc.cpp
src/main.cpp
src/test/test_bitcoin.cpp