Eike Ziller 469edcdde3 Merge remote-tracking branch 'origin/4.5' ...

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

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa

2017-12-12 10:53:51 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/4.5'

2017-12-12 10:53:51 +01:00

share.pro

Make Creator compile without Qt tools in some configuration

2017-02-10 13:30:53 +00:00

share.qbs

Remove external tool for "sort text"

2017-11-03 07:30:52 +00:00