OSDN Git Service

Merge remote branch 'origin/2.0'
authorErik Verbruggen <erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:33:45 +0000 (11:33 +0200)
committerErik Verbruggen <erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:33:45 +0000 (11:33 +0200)
commitc364e5522e20859bf233a9c04d3758965e62630a
treea2a7a36a8ef79195c85b1ff02323f0c80fa91bea
parent05639e468860d50afadc862d29645e0cc395bc52
parente5b9c76f277fb256a044240854cde52ecff7cd33
Merge remote branch 'origin/2.0'

Conflicts:
src/plugins/qmljseditor/qmljshighlighter.cpp
src/plugins/qmljseditor/qmljshighlighter.h
src/plugins/texteditor/basetextdocumentlayout.cpp
src/plugins/texteditor/basetextdocumentlayout.h