Oswald Buddenhagen 5a7d3e78db Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47

2016-01-04 14:11:07 +01:00

32 KiB

Raw Blame History

View Raw