Merge pull request #4599
commit309aa76d279d2986b8d5a3756a38380c97107db7
authorJeff Garzik <jgarzik@bitpay.com>
Fri, 29 Aug 2014 19:23:13 +0000 (29 15:23 -0400)
committerJeff Garzik <jgarzik@bitpay.com>
Fri, 29 Aug 2014 19:23:13 +0000 (29 15:23 -0400)
tree3a3b49819669e27d6b76d7b3d99b99c3b802505c
parent539abc4729ea16039d148cfa3b771929f7d37584
parentc7b6117debf4ebabc464a55b840bdd7bdeb94fa3
Merge pull request #4599
src/init.cpp
src/main.cpp
src/qt/clientmodel.cpp