summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-19 14:32:54 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-19 14:33:00 +0200
commit52f416f7889c2e63b901eeca07f2c5bda7b27b93 (patch)
treec2d1c91e77819d16e741846ba5e30fa01ac743c2 /src
parent059fc10f8f70a65265a27c354322099806d23d7e (diff)
parent42f94f30488a01751f387dc9bd3160ce1b4dfa58 (diff)
downloadqtscript-52f416f7889c2e63b901eeca07f2c5bda7b27b93.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ie199d987383f325629fb31dad05197e80af7bf3c
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions