hjk afcc0f7bf1 Merge remote branch 'origin/2.0' ...

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h

2010-08-12 11:07:08 +02:00

..

qtcreator

Merge remote branch 'origin/2.0'

2010-08-12 11:07:08 +02:00

share.pro

Fix link error of qmlobserver by adjusting build order

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