aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 11:14:37 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 11:14:41 +0200
commit93a998f5ef31f7d9f8dd72909c4342db84cc1b59 (patch)
treebd3cf0cd679166978eaf7c7b5e9e99740cd8bda9 /dist
parentdf31e3295eb114452bf4176ebdc1aa303fbe2b42 (diff)
parent4d09bf3dd58b1ccf67a8f6e9623964684b6f231a (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions