diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:14:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:14:54 +0100 |
| commit | 354bda2ae41feb157c890766e2abcbc8be07f101 (patch) | |
| tree | c99eb9a9ec0fa6b5d3f91cc3241b217f89f0656d | |
| parent | 2fe7d91df9dd53904bce39f4dc4f9ec526bb14b2 (diff) | |
| parent | 9fa7594a6ec84f5780536b6c99feed9279655acf (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I4d63977385104414abe119a4aa7470129ac438ab
0 files changed, 0 insertions, 0 deletions