diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:31 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:46:27 +0200 |
| commit | 99139078ec5dfd0b03ff67cd5e3efc39cb10d10e (patch) | |
| tree | b6fc80361efa11b14e2e742066eacedc1d9103ff | |
| parent | 6aa5076f98d006e1ecd505835a2f77210a92a371 (diff) | |
| parent | ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ifba4093fb3e2c3ba4c2504405c9723a5ea8b9728
0 files changed, 0 insertions, 0 deletions