Merge branch 'checklevel' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 16:18:56 +0000 (12:18 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 16:18:56 +0000 (12:18 -0400)
1  2 
src/db.cpp
src/init.cpp

diff --cc src/db.cpp
Simple merge
diff --cc src/init.cpp
Simple merge