OSDN Git Service

Merge branch 'origin/2.0' (early part)
authorErik Verbruggen <erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:30:51 +0000 (11:30 +0200)
committerErik Verbruggen <erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:30:51 +0000 (11:30 +0200)
commit05639e468860d50afadc862d29645e0cc395bc52
treea2a7a36a8ef79195c85b1ff02323f0c80fa91bea
parent0894033f9387dc3afa688ed0c4adcd0b27949f7b
parent512e75a56195adf65577a024e363b36761cfc897
Merge branch 'origin/2.0' (early part)
12 files changed:
src/libs/cplusplus/MatchingText.cpp
src/libs/cplusplus/MatchingText.h
src/plugins/cppeditor/cppeditor.cpp
src/plugins/cppeditor/cppeditor.h
src/plugins/help/helpplugin.cpp
src/plugins/help/helpviewer_qwv.cpp
src/plugins/qmljseditor/qmljscodecompletion.cpp
src/plugins/qmljseditor/qmljscodecompletion.h
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.h
src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor.h