Eike Ziller 57ae91c5ef Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472

2011-08-30 15:59:07 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/2.3'

2011-08-30 15:59:07 +02:00

share.pro

Make Components installable. Fix Shadow Build.

2011-08-03 16:12:35 +02:00