diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:34:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:34:04 +0100 |
| commit | 1c4e3b3c81c24a16f5d19934ad671fa4eb047784 (patch) | |
| tree | 7ecd4aeef3117f23d26e613f80c54262bc3a3659 | |
| parent | 016eddf634f2a673a784e492c7b25ee3fdecc17d (diff) | |
| parent | 32f2fe582a672e498c496fd3b7a17e9a94b0bbce (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: If922827292ac38a5c4d9e4ecd74995af9ed444b5
0 files changed, 0 insertions, 0 deletions