diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 10:03:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 10:03:14 +0100 |
| commit | 4920004d5fcd10174e2e90b0853714d57b07250a (patch) | |
| tree | 9193c38527a686ed639998182a3dc3ea8e743e23 | |
| parent | 8d58d0ea77c8dcd3bd8e22639ca9947be43bf540 (diff) | |
| parent | bc4dca032f385658898db017af110f4d8e29816d (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Id8609afcbd68b176bab0c52e8092e45752836397
0 files changed, 0 insertions, 0 deletions