Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 17:31:44 +0000 (13:31 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 17:31:44 +0000 (13:31 -0400)
commit2e8b33824f4bd76efd84837335eeb8a025787b4b
tree8343ed061a3a49617124a18e74756e40739c1164
parentd12ea887bcf1eab4b029007c4bf5821992c0c6b1
parentaca3f961dbce34e460dc02d37969b2035d5b2260
Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin
main.cpp