Skip to content
  • dt's avatar
    Make Maemo compile again. · fa0be746
    dt authored
    Conflicts:
    
    	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
    fa0be746