diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:53 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:19:35 +0200 |
| commit | 0bfd0975fac1eded07040307d60d5481efc07461 (patch) | |
| tree | 5cfaf79d8e7cd955ce664975d0d4e54567288eaf | |
| parent | d7ff4e5827512eeb3624b8e9dbb736e3c2624e92 (diff) | |
| parent | 6df36bebdcb0a12069b0cabfed797ebc719b587d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I975dcb488d8115d158ba6f25178ea7170ad4c7e1
0 files changed, 0 insertions, 0 deletions