aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-04-23 18:03:34 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-04-23 18:03:51 +0200
commit734f80a5d18821f4f6d0488996655c6e35ce160c (patch)
treece65060c9fdafb8bd2034151240843612e12d637 /src/merkleblock.h
parentcf7adad3bb0bcff406a3ea4c59fa116367cb7915 (diff)
parent27ce808fb546eba0204cdcb2d87b62efdf583c62 (diff)
downloadbitcoin-734f80a5d18821f4f6d0488996655c6e35ce160c.tar.xz
Merge pull request #6039
27ce808 tests: Error when setgenerate is used on regtest (Wladimir J. van der Laan)
Diffstat (limited to 'src/merkleblock.h')
0 files changed, 0 insertions, 0 deletions