Skip to content
Find file Blame History Permalink
  • hjk's avatar
    Merge remote branch 'origin/2.0' · afcc0f7b
    hjk authored 
    Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
    afcc0f7b