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

Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
parents 4293ee40 36c00b43
No related branches found
No related tags found
No related merge requests found
Showing
with 281 additions and 71 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment