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