Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
authorck <qt-info@nokia.com>
Fri, 23 Apr 2010 12:44:44 +0000 (14:44 +0200)
committerck <qt-info@nokia.com>
Fri, 23 Apr 2010 12:44:44 +0000 (14:44 +0200)
commit9c25bcd50a5eabd8c3bfa63ef27949aeb12eaa7f
tree319dafa676dab5bfa108cb23baa2bf981b628936
parentbd9adf630d8f95cfb2cb18731ee581de4efda167
parent868b5aff25a31f3531d5f0be5b16ef2bfc78667f
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
tools/assistant/tools/assistant/assistant.pro
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/globalactions.cpp
tools/assistant/tools/assistant/helpenginewrapper.cpp
tools/assistant/tools/assistant/helpviewer_qtb.cpp
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/mainwindow.cpp
tools/assistant/tools/assistant/mainwindow.h