summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 14:11:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 14:11:37 (GMT)
commit3baea03b43f5221328ab16f05f3fbdcab222eae8 (patch)
tree3ff773209095478090b8fd42c84c5d5ce43b9809 /tests/manual
parentc0194be546e436cdc3294bca4c3c378a15d3b9cc (diff)
parent022884db790a7592fa017add4ea9669d8b5598ca (diff)
downloadQt-3baea03b43f5221328ab16f05f3fbdcab222eae8.zip
Qt-3baea03b43f5221328ab16f05f3fbdcab222eae8.tar.gz
Qt-3baea03b43f5221328ab16f05f3fbdcab222eae8.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/qtouchevent/qtouchevent.pro (renamed from tests/manual/qtouchevent/multitouch.pro)0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/qtouchevent/multitouch.pro b/tests/manual/qtouchevent/qtouchevent.pro
index de1ee06..de1ee06 100644
--- a/tests/manual/qtouchevent/multitouch.pro
+++ b/tests/manual/qtouchevent/qtouchevent.pro