Eike Ziller 30f71eddf8 Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I245212bd45104636b1c9737b36d3db3e4af23092

2016-11-01 09:30:49 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/4.2'

2016-11-01 09:30:49 +01: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

Fix qbs build on macOS

2016-07-28 14:45:12 +00:00