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

Merge remote branch 'origin/2.1' into 2.2 

Conflicts:
	doc/qtcreator.qdoc
parents ac28279e 6adc5b12
No related branches found
No related tags found
No related merge requests 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