hjk 64e4a8f7ae Merge remote branch 'origin/2.0' ...

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

2010-08-13 11:19:44 +02:00

..

qtcreator

Merge remote branch 'origin/2.0'

2010-08-13 11:19:44 +02:00

share.pro

Fix link error of qmlobserver by adjusting build order

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