summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-01-11 11:20:38 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-01-11 11:20:38 +0000
commit84f0bed975eb1be4c4db1c47acde4e9ce9eb4628 (patch)
tree9c92be621cebd95670780175d0e6e32703595082 /tests
parent3ccbfd5cfb4864903bddac0fb9481d11c42a9f53 (diff)
parent3fe3c36039a68df52ce072af034ada6b4b946cb4 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions