src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp · 4a16cb9c38a63dd837bf40de77e170de83b3a2ba · Tobias Hunger / qt-creator

14 years ago

con authored 14 years ago

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

39a8e977

History

Merge commit origin/2.0 ''

con authored 14 years ago

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