Skip to content
Snippets Groups Projects
Commit e03a6b6e authored by Christian Kamm's avatar Christian Kamm
Browse files

Merge branch '2.0' 

Conflicts:
	share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
	src/plugins/debugger/stackhandler.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
parents 06afc4f8 df87d970
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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