Skip to content
Snippets Groups Projects
Commit dfee3388 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/2.1' 

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
parents f3cb1f0b 9240ceaf
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 679 additions and 193 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