diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:26:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:26:36 +0100 |
| commit | 6a44af0358bb5bccb4ec9ae2ab9e2bae95cf4444 (patch) | |
| tree | 7932657b25aaa0fc793267c31248784a93476fa5 | |
| parent | 21927fdbdbe4d928d909b0a9e7992ed9bc817716 (diff) | |
| parent | d7257f75e1e9f89a2934c50784d76d90f919605f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Ia19ad50f965693c33ce442f8af91208f3f8abfcd
0 files changed, 0 insertions, 0 deletions