summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-21 14:51:50 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-21 14:52:50 +0200
commit657822611315760a8b4599b36884f3c1b17ee1ef (patch)
tree715b15a1efd55ace2d6e08cc57af34a96284042e /tests
parent9a2a1e2f7bebad465d474efd6d363b8c1ded940f (diff)
parent50446e4edb0360871309a5d72a9a873f45fb17bd (diff)
downloadqtscript-657822611315760a8b4599b36884f3c1b17ee1ef.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: If343f2bd28e84f22edcbd46f1c588123fe0be574
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions