Eike Ziller 85b60d9608 Merge remote-tracking branch 'origin/6.0' ...

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537

2021-12-16 10:50:33 +01:00

36 KiB

Raw Blame History

View Raw