OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Wed, 12 May 2010 15:25:40 +0000 (17:25 +0200)
committercon <qtc-committer@nokia.com>
Wed, 12 May 2010 15:25:40 +0000 (17:25 +0200)
commit1fd12ab63bbf1bb632de2898859affd7c720752a
tree4ccc7894979cb6bc3bca4efd55f927b8e74c6e2f
parent64d65fb69811da29fa29b9e08ddd3b8a58e4cee3
parentacea722d7543560b3ee7dd79dd5ab6a545eb51de
Merge remote branch 'origin/2.0'

Conflicts:
src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/coreplugin/coreconstants.h
src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/cpptools/cppcodecompletion.h
src/plugins/debugger/cdb/cdbdebugengine.cpp
src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor.h