diff options
| author | ck <qt-info@nokia.com> | 2010-04-23 12:44:44 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2010-04-23 12:44:44 (GMT) |
| commit | 9c25bcd50a5eabd8c3bfa63ef27949aeb12eaa7f (patch) | |
| tree | 319dafa676dab5bfa108cb23baa2bf981b628936 /tests/auto/selftests/skip | |
| parent | bd9adf630d8f95cfb2cb18731ee581de4efda167 (diff) | |
| parent | 868b5aff25a31f3531d5f0be5b16ef2bfc78667f (diff) | |
| download | Qt-9c25bcd50a5eabd8c3bfa63ef27949aeb12eaa7f.zip Qt-9c25bcd50a5eabd8c3bfa63ef27949aeb12eaa7f.tar.gz Qt-9c25bcd50a5eabd8c3bfa63ef27949aeb12eaa7f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
tools/assistant/tools/assistant/assistant.pro
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer_qtb.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'tests/auto/selftests/skip')
0 files changed, 0 insertions, 0 deletions