summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 12:56:53 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-26 12:56:53 +0100
commit177a8090fbe346ab34040acc60655dcb768ebf4f (patch)
tree2a2d368a21db5a6564a7a347642155e460a95a00 /dist
parent0f91218091da69a81eb3e3336d1bdbe572a21908 (diff)
parentcd0535c2927f65b7b221c9c946b65147ae1c4dbe (diff)
downloadqtx11extras-177a8090fbe346ab34040acc60655dcb768ebf4f.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Iff115b9216edf478b205832187565dcda4675af4
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions