diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-21 11:46:44 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-21 11:46:55 +0100 |
commit | 919aaf6508557439ab859c25dae86998a9bed12f (patch) | |
tree | 8c4e20718157d355ae98d4c6bbe976e3a093604f /test/functional/combined_log_template.html | |
parent | 3192e5278abca7c1f3b4a2a7f77a0ce941c73985 (diff) | |
parent | b5bec4e330fc7201d989663b4dbc6a1e620dd0f9 (diff) | |
download | bitcoin-919aaf6508557439ab859c25dae86998a9bed12f.tar.xz |
Merge #10039: Fix compile errors with Qt 5.3.2 and Boost 1.55.0
b5bec4e Avoid QTimer::singleShot compile error with Qt 5.3.2 (Russell Yanofsky)
d5046e7 Avoid scoped_connection compile error with boost 1.55.0 (Russell Yanofsky)
Tree-SHA512: 96362b872817681b062e05c8fcb76cfc23b6e87e0371584a6aae0e17535fd34ccdba922380aa4b669a8e75ef3f9fadd25061541f77cb3198173f04249a7bcd62
Diffstat (limited to 'test/functional/combined_log_template.html')
0 files changed, 0 insertions, 0 deletions