Merge branch 'op_eval'
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 20 Dec 2011 19:43:31 +0000 (14:43 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 20 Dec 2011 19:43:31 +0000 (14:43 -0500)
commit595925592d36fb5d5d34beea3c3e71fca2b6726e
treee28c34353aa08a6f3c0368a39982970c08245ea3
parentf06e3e0ea6c8da90585a9f0936c390659dcece37
parent77f21f1583deb89bf3fffe80fe9b181fedb1dd60
Merge branch 'op_eval'
src/bitcoinrpc.cpp
src/main.cpp
src/main.h
src/wallet.cpp