diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:24 +0100 |
| commit | f4d122b2912e7bc13c9e076a32a6b5c080aa4825 (patch) | |
| tree | a70e4bda9d80431602d4160ea32d28458be06963 | |
| parent | a1bbcaac18205610bc9c89368eb595fbc12453b4 (diff) | |
| parent | 2f0a5a4192fd8ca6d00391c6307973805d23a2f2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ic9f4c64bb43eab84678168697f1363f95acb1c59
0 files changed, 0 insertions, 0 deletions