diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:08:38 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:09:07 +0200 |
| commit | 5da3ccca6237bb193c5461a371c8092df0f9c5be (patch) | |
| tree | b4eb13182721454c1d88f05e6d3f72e931383874 | |
| parent | e80c1bf24039ff36ff874f313be53ac2a70029de (diff) | |
| parent | 6aa5076f98d006e1ecd505835a2f77210a92a371 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I4ad4abdf21116a7323354306c8d2d3c0a18c734a
0 files changed, 0 insertions, 0 deletions