Skip to content
Snippets Groups Projects
Commit 458a25ef authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
parents 443d5d3d 13bb14dd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 346 additions and 121 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