diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:52:43 +0100 |
| commit | ae1987696185f34482105ef3e542fc6c121d3614 (patch) | |
| tree | 9682c6c202dff40efda39e44a254e97576b55e98 /dist/changes-5.10.0 | |
| parent | a56d14f97c4b5aac1ab1cd3e95ce763452ea3e34 (diff) | |
| parent | ea7de894f711d8fa4f6cf78b5a409889849ee1f2 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I5a19f702cce4bd518f873140c4cbe0c7e53d6bce
Diffstat (limited to 'dist/changes-5.10.0')
0 files changed, 0 insertions, 0 deletions