summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:24:39 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:24:39 +0200
commit50446e4edb0360871309a5d72a9a873f45fb17bd (patch)
treef0cdc88518dbb9c22fb43f9f8dcc9c98f10cf0ca /tests/auto
parent600d730a2a3eb4920d71050d39261f755da3c939 (diff)
parenteb08742e8f874b8dab209c1cfe840c534c68ca3b (diff)
downloadqtscript-50446e4edb0360871309a5d72a9a873f45fb17bd.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.1
Conflicts: .qmake.conf Change-Id: Id27995a8aa7eb220d5b4ffdbbc5bd1a8faa656f3
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions