diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:30 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:30 +0100 |
| commit | 801def0ca1adb14584a9540069a3d87703d163a7 (patch) | |
| tree | 1f28cd8c245079a668948b80ced641af088fff92 | |
| parent | f61b2803146aba90ec0084c12ef1a356eb5f062f (diff) | |
| parent | d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I0d2fc871a0bafa1711673cbfafa11d6933da5191
0 files changed, 0 insertions, 0 deletions