summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-01 21:58:04 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-01 21:58:04 +0200
commitf0482d704e3834f2199889f997b421c0171bd94f (patch)
treee18c050e92771e32e4ea259ad7ba170683403f7e /dist
parentb3d27c681ac216f82ea8b2de1e21858a6c2b7af0 (diff)
parent0d31e8cd10d09fd2b28052c89a4f96c32c104848 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions