-
dt authored
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
fa0be746
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h