diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:12:02 +0200 |
| commit | 9bf0b2d853552a5e0033d4c38ec013553efe36e6 (patch) | |
| tree | f0f04bbaea02165089258db6007d397313088a9f /dist/changes-5.11.1 | |
| parent | 57a57183fe5a50cbaa6e29c2f275d86ee9b45a78 (diff) | |
| parent | 78f6c358ac3e6690957f499bfd3845ac082f38e8 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I6f14ad2c7c0669b69e40fdc90749580e4ca7fbd1
Diffstat (limited to 'dist/changes-5.11.1')
0 files changed, 0 insertions, 0 deletions