OSDN Git Service

Merge remote branch 'origin/2.0'
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Fri, 6 Aug 2010 08:46:50 +0000 (10:46 +0200)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>
Fri, 6 Aug 2010 08:46:50 +0000 (10:46 +0200)
commit7e739985b25b16af504adb280685c961afbcbcc8
tree4bd678eaaac49ed580d2ad091c218961a5d08081
parent077c9181863e0036ae16772530cd2624af9e7b78
parent9bad0c01bec3547324bf9340497fb956467a9531
Merge remote branch 'origin/2.0'

Conflicts:
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/git/gitclient.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
12 files changed:
doc/qtcreator.qdoc
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/git/gitclient.cpp
src/plugins/git/gitclient.h
src/plugins/git/gitplugin.cpp
src/plugins/git/gitplugin.h
src/plugins/help/helpplugin.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/qt4projectmanager/qt-s60/s60devices.cpp