Merge pull request #1052 from sipa/scopedlocks
authorPieter Wuille <pieter.wuille@gmail.com>
Mon, 9 Apr 2012 20:25:17 +0000 (13:25 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Mon, 9 Apr 2012 20:25:17 +0000 (13:25 -0700)
Use scoped locks instead of CRITICAL_BLOCK

1  2 
src/bitcoinrpc.cpp
src/db.cpp
src/util.cpp

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