diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:13:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:13:29 +0100 |
| commit | fce4acfcee2082d2f2498e6b366959b16933a177 (patch) | |
| tree | 2a20fb9152c9d64b48e98f77b961e50664bb9c5c | |
| parent | 5c28e1d983a5231517fb783ef80406c5d2ec487e (diff) | |
| parent | 62867033d440a7803c6c4648c0f560e9d950a7a3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I15dd24f74bc97c56f71c634035b7076c2fe67f25
0 files changed, 0 insertions, 0 deletions