diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:42:45 +0200 |
| commit | 86c14e8a9f6ea8675b3fe1cb5e741f91771dd051 (patch) | |
| tree | af48a9f1a1ec2b31ed8287e40e2cc5d6879db938 | |
| parent | 45ebe8e27fb5ad90db0125f4e22cbd222f466082 (diff) | |
| parent | b68d01c6c58c96823654fa527a4a3feadea67694 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Idbba4f642ee6b69d506c42f62b7c4686e636613b
0 files changed, 0 insertions, 0 deletions