diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:00:57 +0200 |
| commit | 5900b8d3c65082286f65bd93ba71a7acbf980336 (patch) | |
| tree | f75fe2b0cc948f279f1143367e86f01c03c4f1c1 | |
| parent | e538481224c2963e67ef4d00f763d6cc556511fe (diff) | |
| parent | 98ea3cf16e978efb9d3dc7c8708dfa739a796ba9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I5daaafc33163ce0813ff99d3457c258eee78aa93
0 files changed, 0 insertions, 0 deletions