Eike Ziller 8259df00d0 Merge remote-tracking branch 'origin/7.0' ...

Conflicts:
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportplugin.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ib423e9f23877176f01b188104b0a179ed32c4770

2022-02-22 14:06:41 +01:00

..

imports

Disable -Wmissing-field-initializers when building with GCC

2022-02-17 09:33:20 +00:00

modules

Merge remote-tracking branch 'origin/7.0'

2022-02-22 14:06:41 +01:00