diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:51 +0100 |
| commit | 6a7639e40336089eb21ff79a2d455464c2b6d47a (patch) | |
| tree | 8eecb82dc993dde98bd1744b06bd6f9a2e3313dc | |
| parent | 7da78510f828a02c7a9be70c9f3a37da53521554 (diff) | |
| parent | e542b1b6c46e49baec66d427a2664cc2c6aefa01 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I272228f2ece776f651de8e2f647dec2bdb2d64bd
0 files changed, 0 insertions, 0 deletions