diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:47:34 +0200 |
| commit | 2ee4d899378b3128493b6a22b0c954150568ba59 (patch) | |
| tree | 9c1f746e8ec222430bcd28b61b4d2239098b6697 | |
| parent | 039611b2b78ad74fa0de7c87cb1415b50efdb7de (diff) | |
| parent | ee681478c4b05ab6640c0318ed4fa25d62c6f356 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I656af31fcc775bd5416f7e8ec8f15d3c6e799f9f
0 files changed, 0 insertions, 0 deletions