Skip to content
Snippets Groups Projects
Commit 440dbebf authored by ck's avatar ck
Browse files

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
parents 294ed8a3 f6ac7aab
No related branches found
No related tags found
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