Merge branch '4wayswitch' of https://github.com/dooglus/bitcoin into integration
commit245e1b4fdba704cdb1e9fa4d33d6e09d0647e0fe
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 21:21:59 +0000 (20 16:21 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 21:21:59 +0000 (20 16:21 -0500)
treef8d3065e83ac432ff819db4a7b77e4f79a51740b
parent87c1947d494c015a51dfb75721c43e2185b49c32
parent8b8d59eefb739349608f40cfacddf007f9d56f3b
Merge branch '4wayswitch' of https://github.com/dooglus/bitcoin into integration
main.cpp