Merge pull request #6457
commit3c923e897538b9d8d55956b981d5540f0fdbf0b2
authorWladimir J. van der Laan <laanwj@gmail.com>
Mon, 20 Jul 2015 08:46:20 +0000 (20 10:46 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Mon, 20 Jul 2015 08:49:02 +0000 (20 10:49 +0200)
tree8263888fdff7763fd6b9227739ef40218b862083
parentdcc495e011ff09e54f7c8ddebfc5b73f084de1ea
parent0ef9858707093053f45469d8f7cef20be4930f64
Merge pull request #6457

0ef9858 Documenting pruned, pruneheight and softforks in getblockchaininfo (Simon Males)
0c89579 Include pruned state in chaininfo.json (Simon Males)