Skip to content
Snippets Groups Projects
Commit c364e552 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

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
parents 05639e46 e5b9c76f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment