Files
qt-creator/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
Eike Ziller b18711da91 Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
	share/qtcreator/debugger/lldbbridge.py

Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
2020-07-06 16:23:13 +02:00

4.3 KiB