diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:10:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:10:40 +0200 |
| commit | cc37e71dd59532b165c78a6c272f35226da734da (patch) | |
| tree | d82c2245ef94ffd4602b842a11e68db482740027 /dist/changes-5.7.0 | |
| parent | 93b58e3b33181c56e71a31518e5c4159e9e7544c (diff) | |
| parent | d973d761c5722ee21106f84ca5db89bb58c103d1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Idbbad4585c05ea7c42c5d60e8b74ec20ca3d8737
Diffstat (limited to 'dist/changes-5.7.0')
0 files changed, 0 insertions, 0 deletions