diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:01:43 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:50:58 +0200 |
| commit | 88e2eb6e4b6ead1f60a27e14aedde1a102ef24c2 (patch) | |
| tree | 9cfcbd3c400dc7ec1c70bcb8e8f75b985cbe35c1 | |
| parent | ff5ecc6cc878f3937bee8d5db634d56b69cfedda (diff) | |
| parent | 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I48d89401b174483be79f903a63a99bbe016ec2a2
0 files changed, 0 insertions, 0 deletions