Eike Ziller ab0c3da08f Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e

2013-07-11 08:02:41 +02:00

..

pluginspec.qbs

Merge remote-tracking branch 'origin/2.8'

2013-07-11 08:02:41 +02:00