-
Christian Kamm authored
Conflicts: share/qtcreator/qml-type-descriptions/qml-builtin-types.xml src/plugins/debugger/stackhandler.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
e03a6b6e
Conflicts: share/qtcreator/qml-type-descriptions/qml-builtin-types.xml src/plugins/debugger/stackhandler.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp