diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:24:52 +0100 |
| commit | 81c41221cf7ca133b24d5c61d2e2fff7aa68eedc (patch) | |
| tree | 9c84c504b3fb92ddb2f2fc465d0f0680d5a4c5f5 | |
| parent | 602f1225938f9338c3ee799c64d5449ebc12b8bc (diff) | |
| parent | cf957e407030fc260bd86882cf2f79724126abdd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Icfa31ff7f17842b66eac89863e016b1a96eccc36
0 files changed, 0 insertions, 0 deletions