diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:43 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:09:43 +0200 |
| commit | ed370f466be2177b45d8c794d4665694a13517ee (patch) | |
| tree | 79ab5efead2c397f6c4cef372a7cb7659e14bb4c | |
| parent | c4c1470eb5217f4da780f58d200f53ceb45f93a7 (diff) | |
| parent | 8eb2232ea40b7ceacb694028d003f3bac7ac27ad (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I62525b8514d9b1a085006d71946b07e7dbf718f6
0 files changed, 0 insertions, 0 deletions