diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:58 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:58 +0100 |
commit | 2914af23f0691bc04c1bd66faf79b403e68ff8e4 (patch) | |
tree | a28771d181eba0d6e52fa77a49e0486cb21e624f /dist/changes-5.5.0 | |
parent | e778807d66eaff9112f92009b76e4ff35d03204b (diff) | |
parent | e44b34a2f9e21ee96c837b15eb9328940abec7e5 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Id229f5875db1f1ae7dc4e3f34da3684b993ddff2
Diffstat (limited to 'dist/changes-5.5.0')
0 files changed, 0 insertions, 0 deletions