Eike Ziller 2278ebed1e Merge remote-tracking branch 'origin/4.6' into 4.7 ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp

Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18

2018-05-14 09:44:43 +02:00

139 KiB

Raw Blame History

View Raw