diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:27 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:07:34 +0200 |
| commit | 0222a426e631d61c35a7507775eb8b2c959ab226 (patch) | |
| tree | aa149123ed121c9168a3199731852ea7f6e9eb64 | |
| parent | d3ed5bcb3e1a4175d31333db71dbd52443b727c9 (diff) | |
| parent | db44c53e73479ee8ea98f911078b387735906f38 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I72c1322203a9f5bbeba52098ba412d210ed8eb59
0 files changed, 0 insertions, 0 deletions