Merge remote branch 'origin/2.0'
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment