diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:01:24 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:50:01 +0200 |
| commit | 32c0ebbc497bd21c9ac663ee8cc493c28c18651f (patch) | |
| tree | 62b3c054714e392e5b734375eba7402cddbe3231 | |
| parent | 8d1917209a04286b2befbaff7d8e0ed5256fb232 (diff) | |
| parent | 1efe161af9f43c07abf447f60df7eca3e541e768 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I031206ba9e10a1dd4a8a7887ec3f8a2a9a53ffde
0 files changed, 0 insertions, 0 deletions