diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 08:11:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 08:11:25 (GMT) |
| commit | 1d509901d185745df74f2aae04783e9be9bb7cd0 (patch) | |
| tree | 16df2ab7f33734eb91328d3e6760edd54ce92961 /tests | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| parent | e5ef6f580e1b601898a2fea095ed5be9823bab25 (diff) | |
| download | Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.zip Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.tar.gz Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'tests')
| -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 |