Eike Ziller 098637b758 Merge remote-tracking branch 'origin/4.15' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
	src/plugins/ios/iosprobe.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I6c2136b576c44fc35def397191db97069599f183

2021-06-07 08:37:56 +02:00

6.3 KiB

Raw Blame History

View Raw