Skip to content
Snippets Groups Projects
Commit 3c69d2ce authored by con's avatar con
Browse files

Merge remote branch 'origin/2.1'

Conflicts:
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
parents 35652450 fb3524af
No related branches found
No related tags found
Loading
Showing
No files found.
with 0 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment