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

Merge commit 'origin/1.0.0' 

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt4project.cpp
	src/tools/qpatch/qpatch.cpp
parents 382ec11e 0be29685
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 509 additions and 1283 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