con d24d01f49c Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (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

2010-07-13 11:31:05 +02:00

..

qtcreator

Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)

2010-07-13 11:31:05 +02:00

share.pro

move the qtcdebugger tool to an appropriate place

2009-06-08 15:55:41 +02:00