Merge pull request #6550
commit5b77244c60f3137647fed1c9510965d48992ccbe
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 23 Sep 2015 17:34:32 +0000 (23 19:34 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 23 Sep 2015 17:37:51 +0000 (23 19:37 +0200)
tree743e4e2151f1e970ca9b44e8f39e57456ec80d7b
parente04b2fa9bab15678a12805e2a92c76be42f38349
parent3b33ec85ed00ba7e7525858e3701f9f55071c58b
Merge pull request #6550

3b33ec8 Avoid duplicate CheckBlock checks (Pieter Wuille)
391dff1 Do not store Merkle branches in the wallet. (Pieter Wuille)
src/main.cpp