OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Mon, 5 Jul 2010 11:54:07 +0000 (13:54 +0200)
committercon <qtc-committer@nokia.com>
Mon, 5 Jul 2010 11:54:07 +0000 (13:54 +0200)
commit6503099becc0fc993b146c04c51563012a582306
tree59479301c5dd8a4861d631d84854a5b11c541dca
parentd209bd72db8be026815fdb81dc32dbde13981de3
parent4245b4ab441e25754a61d7929d6287ad493ae88d
Merge remote branch 'origin/2.0'

Conflicts:
doc/qtcreator.qdoc
src/plugins/bineditor/bineditorplugin.cpp
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/plugins/bineditor/bineditor.cpp
src/plugins/bineditor/bineditorplugin.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeragents.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/git/gitcommand.cpp