diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:10:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:10:53 +0200 |
| commit | d5897524507a476cf07ac0d19a5a9a7467f008d1 (patch) | |
| tree | 9a3e7ad17ec48a6bd302a3341235b128e4b51286 | |
| parent | de0b8954d0ddd57811c077d51b5f06c45e0048d6 (diff) | |
| parent | 470e683fe32af29cc6454c83cc660576d75110fd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I3f4cd43e459509af88cfc49d8bcaa8fe36167bb1
0 files changed, 0 insertions, 0 deletions