diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:35 +0100 |
| commit | 17b09a4f69a0af078e6caf91ffc830096cf0ba1c (patch) | |
| tree | a28b3f4d8cc8cf85031a1bdaf66b9243cc64fbb3 | |
| parent | 71a4a624fcdc2768d19619fa5a0bc583e2cc2a11 (diff) | |
| parent | b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I16a85230a5e0437e9d50109fe0077a2dcffcff5e
0 files changed, 0 insertions, 0 deletions