summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-05 19:32:05 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-05 19:32:05 +0200
commit7b443cd0fdd1940a8bfaad73df5e309a52b7669f (patch)
treed6eedd5d35db41c09864997596b0749b12a2e6f4 /dist
parentc4b8dee6b4cfdc6728094d237d7984791e2cecea (diff)
parent052e7ce371d4719df778ad8b378bcf1af14d294b (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions