Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 24 Jun 2011 15:17:22 +0000 (11:17 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 24 Jun 2011 15:17:22 +0000 (11:17 -0400)
commitc774b1697690c3f94ccd79c5de660b6050ac6409
tree0bcc76e794bd82097c9fdda1da3c38835ab590ee
parent77ba3ab99c0803ef1f7d03b7884c75588b6e09de
parenteade213197db4f5858572babc0a219b6ffad92ec
Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin
src/main.cpp
src/main.h