Merge #10461: Update style guide
commit55b72f3880f2f7bc700cc6e407746ee32c9ec135
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 May 2017 14:59:33 +0000 (31 16:59 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 May 2017 15:00:00 +0000 (31 17:00 +0200)
tree21af9086a5bdac052f19aac7cde95a87dfd47ca4
parentc1c9a95379d364ea8ca5d3d0789e8afb1a99bb8b
parent47d84414662c09bc08cfc96f78457ddd602a20ac
Merge #10461: Update style guide

47d8441 Update style guide (Pieter Wuille)

Tree-SHA512: 0b11365f294eeda1ea5c45cf04b3f38435602f61edc0c605e067ed9d17d17c28e9f1dd76bd4fa8a630e9cec8c5103cd2bfe5f6097196761d576913d9180f2ecf