diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:14:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:14:41 +0200 |
commit | 93a998f5ef31f7d9f8dd72909c4342db84cc1b59 (patch) | |
tree | bd3cf0cd679166978eaf7c7b5e9e99740cd8bda9 /dist | |
parent | df31e3295eb114452bf4176ebdc1aa303fbe2b42 (diff) | |
parent | 4d09bf3dd58b1ccf67a8f6e9623964684b6f231a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I85afc39028bdbdca089efca59290f231bc413e7c
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions