diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-11 18:12:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-11 18:23:20 +0200 |
| commit | 892809309c1bc370677241a715e57a2744f94323 (patch) | |
| tree | bd70d6f0bd904735772547475bda2284201f1537 /src/qt/coincontroldialog.cpp | |
| parent | 364da2c52942ebfe92d1d1495a309a8a9dd18ef3 (diff) | |
| parent | faaeeb0d3e777d991c7cfee983bea369c109f5cc (diff) | |
| download | bitcoin-892809309c1bc370677241a715e57a2744f94323.tar.xz | |
Merge #11420: Bump univalue subtree and fix json formatting in tests
619bb05 Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74 (MarcoFalke)
Pull request description:
The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break.
Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now:
```sh
./contrib/devtools/git-subtree-check.sh src/univalue
Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e
Diffstat (limited to 'src/qt/coincontroldialog.cpp')
0 files changed, 0 insertions, 0 deletions