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