diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:31 +0100 |
| commit | 03dd40f8bf0bf7cf10830a9fe04de63c0fd95e63 (patch) | |
| tree | 0e37568a97f9b3ca5d1c3114a719ea676cffa1f0 | |
| parent | 8eb192fe9ed2583e21450a1e567b3d461398d322 (diff) | |
| parent | cc0df66a3e3ed4099fba96eeb287239405d49a19 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I45a015def1a5794a108a2ef8d39e28d91bd69135
0 files changed, 0 insertions, 0 deletions