Skip to content
Snippets Groups Projects
Commit afcc0f7b authored by hjk's avatar hjk
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
parents 28590651 e253896b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment