Skip to content
Snippets Groups Projects
Commit 6b6d9871 authored by dt's avatar dt
Browse files

Merge remote branch 'origin/2.1' 

Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
parents a84ad427 c7142aff
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3512 additions and 3010 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