diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:13:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:13:46 +0100 |
| commit | e14d6cd4de7e2692da95511e8a2dc53fa30d1cc2 (patch) | |
| tree | f890b7f990f3c1bc69396d82bb8257aa9efd9fe0 | |
| parent | 0ec5e8edbb9a4b39787c75b88eeb6b2216a16833 (diff) | |
| parent | 42ec006a0b82ba24eaa13b45e959d85cd9bb0d02 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: If0081ca266f9e4adbae22de3b84abfbfd159f2c7
0 files changed, 0 insertions, 0 deletions