diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:01:35 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:14:13 +0200 |
| commit | 74ab42d1cde9f2c0b4627c6a1a81ea93fe366cc1 (patch) | |
| tree | 5bd4fb3899288e5242b9732b8cc5771796b56373 | |
| parent | 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad (diff) | |
| parent | 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic14bf6bb18c30b3c2759d40dd7b4ec86fb0670e4
0 files changed, 0 insertions, 0 deletions