Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoi...
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
commit5a3dea451d8a53ec87cbd7a7d1405a970fb1b263
tree84a47b03eb615c8d8a4c3df2f7d0dbb0ad698dc0
parentf92f022edaa2f14951b9ce8304a304ff9693ae16
parent83f4cd156e9d52bd7c4351336dfa4806a43ee4e4
Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin into unique_coinbase
src/main.cpp
src/main.h
src/rpc.cpp