Merge remote branch 'origin/2.0'

Browse Source

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

...

This commit is contained in:

Erik Verbruggen

2010-06-15 11:33:45 +02:00

parent 05639e4688 e5b9c76f27

commit c364e5522e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available