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

Merge commit '52b9fcca' (origin/2.0) 

Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
parents f823c481 52b9fcca
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 829 additions and 622 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