diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:24:53 +0200 |
| commit | 093e7176cf9627db0ea1673ca329b722bd2397a7 (patch) | |
| tree | ea96c15e5277fffda5a4aa60fb014a460a7a32a4 | |
| parent | 5cf4aedf4eb2317b2be469a9184c8113fb7f0c4d (diff) | |
| parent | c47f273569fd389ab86e75749166a953f015ecb9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I00070de09ccb4c433e7c8a10ef6758f6ba192449
0 files changed, 0 insertions, 0 deletions