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

Merge remote branch 'origin/2.1' 

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
parents f6a0c691 bff0dd4a
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 754 additions and 516 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment