-
hjk authored
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
afcc0f7b
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h