Eike Ziller 71d60ee9c8 Merge remote-tracking branch 'origin/4.8' ...

Conflicts:
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: I522f91de70aff28692d7c3a050e8d52df0b82a76

2019-01-15 08:40:23 +01:00

98 KiB

Raw Blame History

View Raw