Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 21:27:15 +0000 (17:27 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 21:27:15 +0000 (17:27 -0400)
commitd89d456655f03159a32e6a4a9df22bfe02d403d6
treeb8a1976fdcc4b55297d66845911dd39b42ef248e
parent79706a8e48a043b9ca83216ba9cbb7413e81710d
parentc59b6f704cd8f42e1943f124f435363bfff244f5
Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin
main.cpp