Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00

share.pro

Include qbs files in qmake project tree

2012-10-16 12:07:53 +02:00

share.qbs

Consistently give qbs groups a name.

2013-06-06 13:40:51 +02:00