Skip to content
Snippets Groups Projects
Commit 7bf0ff8d authored by Christian Kamm's avatar Christian Kamm
Browse files

Merge branch '2.0' 

Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
parents 70448b01 983ed48a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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