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

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f

2013-06-27 14:24:57 +02:00

..

pluginspec

Merge remote-tracking branch 'origin/2.8'

2013-06-27 14:24:57 +02:00

defaults.js

define QT_CREATOR centrally

2013-04-02 12:20:37 +02:00