diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:20 +0100 |
| commit | da883ade638a29c54030d0cbb0eabab8c524a875 (patch) | |
| tree | 0ee65b8e0e8b98a2be45ba2a4c7b2897947b10df | |
| parent | 0c9a5da209d684c4863edecb9477b6323d3daca9 (diff) | |
| parent | dffa1bbb133604d2a6e85e186a2dd2816849ab87 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: I4088f75c91eefc0740555141d34725d84ab0b661
0 files changed, 0 insertions, 0 deletions