diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:51 +0100 |
| commit | 4b29f780435bc27f9ba47883d2b0cb5bbc7d2109 (patch) | |
| tree | 98cee27b652838b5d05f16b89a13494730c39370 | |
| parent | 35f6e58cd747a3d19a503c7fa49bb74aeaedd87e (diff) | |
| parent | 6cdc937d5cbfc4ca6b0520c27d0747a66ccb1879 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc2v5.14.0-rc1v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I4e1bab09bb84a15cb0cabed58b073ecd9eba0bcb
0 files changed, 0 insertions, 0 deletions