diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:16 +0100 |
| commit | 220a1cb6c5c7adc1c61f9a086128de178aec8e52 (patch) | |
| tree | 93a6e093b5d1da91c9392762e29776c7a3646925 | |
| parent | d1cf3be56311fc93a1aa6d8a945b5394b57d31fa (diff) | |
| parent | be20be932e51d103b3ae6270f8921e62e65bd3a1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Idee1e798799825d56758d4235d34c34e3e758e96
0 files changed, 0 insertions, 0 deletions