con 1c2da511b9 Merge remote branch 'origin/2.2' ...

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h

2011-04-01 09:53:09 +02:00

..

qtcreator

Merge remote branch 'origin/2.2'

2011-04-01 09:53:09 +02:00

share.pro

Fix link error of qmlobserver by adjusting build order

2010-08-06 19:01:39 +02:00