diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 13:27:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 13:27:07 +0200 |
| commit | c51e79a1da311255f92500ba08bb773103cb15fa (patch) | |
| tree | 578d0787890dad01ec09e1ec7212f318a9e7e98c /dist/changes-5.9.5 | |
| parent | 3af884ca599c476e078cb38461ad1117c57dc4a3 (diff) | |
| parent | e0b68dfe82b350f5502e939d9cd2ff8a680f846a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I513a9d5e99c2cfb2b5225850fa89394365a8d26b
Diffstat (limited to 'dist/changes-5.9.5')
0 files changed, 0 insertions, 0 deletions