summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlocalsocket
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-12 18:24:33 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-12 18:24:33 +0200
commit2f700c10f3c4287d2c60918e234e92f1524e84d1 (patch)
tree007e68aa6cbeb3c2393fff873b02aac0fe22b422 /tests/auto/qlocalsocket
parentdf1b8802c121790e9c1be3221b49fc1de410ed52 (diff)
parent3fd27b2800d41ec10aa798c572c25939cd77e1a7 (diff)
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix incorrect line breaking in QtWebKit.
Diffstat (limited to 'tests/auto/qlocalsocket')
0 files changed, 0 insertions, 0 deletions