Merge pull request #6370
commitfac21df5f00d1d84d9c1c251d273f2e8070877ec
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jul 2015 15:12:09 +0000 (10 17:12 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jul 2015 15:12:40 +0000 (10 17:12 +0200)
tree545037c5bee3009c42a97e54d1c2090c5acfe3ea
parentc52e8b300a7a5c65f2a1c2e52a8129280de2c301
parent6ebac0782f9201e86d507fe7fff71f2c35680682
Merge pull request #6370

6ebac07 Remove ChainParams::DefaultMinerThreads (Wladimir J. van der Laan)
src/miner.cpp