Skip to content
Snippets Groups Projects
Commit 39a8e977 authored by con's avatar con
Browse files

Merge commit origin/2.0 '1a985148' 

Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
parents 91b6d329 1a985148
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 242 additions and 79 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