diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:45 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:11:56 +0200 |
commit | 0b5690c2ee859afbfcb4180b9b4e86c1c2e7367a (patch) | |
tree | 1359a2103b5cf1baa467d2b6aa25f6b2e699c865 | |
parent | df70f175cc1885f9706bb41252678bea672d1b6c (diff) | |
parent | 7abc8c2805797b6361af34676ac0484b2682aedf (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Iaa11fb83fc2103b46d3c5b0f8cab93f91befe116
0 files changed, 0 insertions, 0 deletions