Eike Ziller 11590a8c5f Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7

2015-04-13 10:53:03 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/3.4'

2015-04-13 10:53:03 +02:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Implement theming for QtCreator

2014-10-15 17:21:10 +02:00