Merge commit '2d5512f2c4e' (origin/8.0) into 9.0

Browse Source

Merges the single commit 2d5512f2c4 by ignoring it.
It was just a hack for 8.0.

 Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ia3b94eee5f5b936931bb0ed536829ae13ec56244

...

This commit is contained in:

Eike Ziller

2022-10-20 15:05:54 +02:00

parent 7b449c9463 2d5512f2c4

commit 47d0ec007e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available