diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:26:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:26:43 +0100 |
| commit | 9702687d29745038a54acdb4625e3e6aa7e2694a (patch) | |
| tree | f09625f4f5cbd68b7568fb6e8bd9dc3970a21905 | |
| parent | 8e097e44aa457efcdb1a0b1ff00d8e794c3a8a18 (diff) | |
| parent | 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I4af296a238e4dcb8d8a814d1a588c113e66cc02c
0 files changed, 0 insertions, 0 deletions