diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:20 +0100 |
| commit | 4579c6eba8ca323f98b25a5aa8032a771e857c2b (patch) | |
| tree | 9f328838228a5f314177e9a7c812a9efb0bbba6a | |
| parent | 2868ff088ac35f0f8fe8e052669bf251e366e416 (diff) | |
| parent | 5841084b4fac22343bdea2b41f4ba493dcfad469 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I65cd2fcba2496b2d4b20e2990050ebea18c90be7
0 files changed, 0 insertions, 0 deletions