diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:20 +0100 |
| commit | 85e0d04e21d2f47eaa0b31c26ee4e04712d523db (patch) | |
| tree | 28f8f46f28de7c5d25ae2a352c36ce697e137c5b | |
| parent | 25017be3e97f0af3ad3882a54bb4e625762bff9c (diff) | |
| parent | 09a6b3cdbef71a56591d2fdeaa2af93199db83cf (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Ib52564c301023583c41d6a8d1311cf57b24ae6fa
0 files changed, 0 insertions, 0 deletions