diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:56 +0100 |
| commit | a7b3894416eb38b3a02e20284a23c8b887d81516 (patch) | |
| tree | 248901e381f567908970dc234f21270da540ed43 | |
| parent | 685591a4e9f295e6bcc1859704a0b6109af255ce (diff) | |
| parent | dccec9b282ae15fa65fd61698dd1cb47325e5c8e (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Iff5aaed3b02a2f59d1ffc88e2b2375da685b100e
0 files changed, 0 insertions, 0 deletions