OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Fri, 21 May 2010 14:04:27 +0000 (16:04 +0200)
committercon <qtc-committer@nokia.com>
Fri, 21 May 2010 14:04:27 +0000 (16:04 +0200)
commite327467a03350a21a08b274cecbee7840f22339d
tree59f47b9dc20431d5d2ef5510a04be3b5727b4bf7
parentec6fc83c5d6865550caf49de67b877d632020e7a
parente9d184155232805d4c82eb164768282fc61fca38
Merge remote branch 'origin/2.0'

Conflicts:
doc/qtcreator.qdoc
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/plugins/cvs/cvsplugin.cpp
src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
src/plugins/resourceeditor/resourceeditorw.cpp