OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Thu, 20 May 2010 07:28:00 +0000 (09:28 +0200)
committercon <qtc-committer@nokia.com>
Thu, 20 May 2010 07:28:00 +0000 (09:28 +0200)
commit7f4cbe23832a6c7251152926ebd426b43253aa20
treed798304f8f7995044d53d07bbd0079856bd5579e
parent6f3228988dd2768c5aacec9cf7cc7facbecb9527
parent552a0728325ba6dec7b679c057b5e3770550d5b9
Merge remote branch 'origin/2.0'

Conflicts:
src/plugins/debugger/moduleshandler.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
doc/qtcreator.qdoc
src/plugins/fakevim/fakevimplugin.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/texteditor/basetexteditor.cpp