diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 17:58:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:20:16 +0100 |
| commit | 5794f3130cb1894ea3d8143c2c89de23886d9c17 (patch) | |
| tree | 06327d3701f4fc6dfa8bbb48c130f25029ab5a8a /dist/changes-5.6.1 | |
| parent | 3317428a98dee4caad6f8e170fb499e4083b2423 (diff) | |
| parent | cd6fc729f32ed01ec52b7aad4be463c8161240bf (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I1370a8ebdfbbcfbf605ed95769dcb600417d4134
Diffstat (limited to 'dist/changes-5.6.1')
0 files changed, 0 insertions, 0 deletions