summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:46 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:46 +0100
commita775b9da4794f1f248b63a4a58ee6ad6885f0622 (patch)
tree55f42013d9feb858b53134978141a61e81539f02 /tests
parent0af88dc973d3410cdd905265ce935916693b2d44 (diff)
parentf5e16ab0e1e153ec86f0d8651571e176ac6caa7c (diff)
downloadqtscript-a775b9da4794f1f248b63a4a58ee6ad6885f0622.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions