Merge pull request #1117 from sipa/deadlockfix
authorPieter Wuille <pieter.wuille@gmail.com>
Tue, 17 Apr 2012 18:05:02 +0000 (11:05 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Tue, 17 Apr 2012 18:05:02 +0000 (11:05 -0700)
commitcaeddc5d3738c95e0755560aa3d9b1f32e9fbce5
treeab6df15302cd3c818e45e6f19330b044db988a94
parent1ffeb89a52d82bb62860786ff6426224437ca7b1
parentc581cc16bb5e490c0960ccf440de2d1e5f23c417
Merge pull request #1117 from sipa/deadlockfix

Fix potential deadlock
src/main.cpp