git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 405ce5a 19197d5)
Merge pull request #633 from laanwj/qtrpcconflict
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 14 Nov 2011 14:56:57 +0000 (06:56 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 14 Nov 2011 14:56:57 +0000 (06:56 -0800)
RPC: do not launch Shutdown in a new thread in case we are running the UI


Trivial merge
Novacoin client