summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-26 09:45:36 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-26 09:45:43 +0200
commit8237511008afdde2cbe382a427560db5f5b7efb6 (patch)
tree9090b7984d296ea1880392f18e2d53d8c81e5cb2 /dist
parent0a6c8a8871085dcd8b029553260031892be3603e (diff)
parent628f7c1de60f66f4b2e179c98bf403f647d8ad60 (diff)
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions