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