diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:06 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:16:24 +0200 |
| commit | 3d2994ee7b053e957d3637a58717bf65f5f77147 (patch) | |
| tree | a3e1de59fe4a4474a5ab1b31553607e8f7715e07 | |
| parent | 32a1422c1e7614f77b951d77340d134222a31c60 (diff) | |
| parent | efbc554c260f15b5c6dc23759eff96c106997a55 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I9fa944073748f3bf83265d7502b0e06e8b04927f
0 files changed, 0 insertions, 0 deletions