-
con authored
Conflicts: src/plugins/debugger/qml/qmlengine.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
2ca77dfe
Conflicts: src/plugins/debugger/qml/qmlengine.cpp src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp