diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:22 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:17:26 +0200 |
| commit | 544f4ad2846b603edee5878b8e85827b1a3453a6 (patch) | |
| tree | ff6d0ba9b786e9e9dc73707ba4bf795c227964ae | |
| parent | 75ef3b628f2d162dd349bbe24e0809ea87c9e91a (diff) | |
| parent | 3fc1164ee5464a317ac4daccc4edca09e4cae630 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I5aea97301fc536aa9f3064bb1beef5684a9195be
0 files changed, 0 insertions, 0 deletions