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

Merge remote branch 'origin/2.0' 

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
parents ec6fc83c e9d18415
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 226 additions and 364 deletions
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