diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 15:26:22 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 15:26:22 (GMT) |
| commit | 8e59d3372d9ba18b48ae0b2271fa453332a1ac12 (patch) | |
| tree | 61c3801151346b756c89040fa640ab1eb57d5f6e /tests/manual | |
| parent | 0b9638476c1a8bad4e33cbd20be1f6ff33935766 (diff) | |
| parent | 90f2f19795a46f3ba1d46fd62f1cbe31072c2c53 (diff) | |
| download | Qt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.zip Qt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.tar.gz Qt-8e59d3372d9ba18b48ae0b2271fa453332a1ac12.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts:
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tests/manual')
0 files changed, 0 insertions, 0 deletions