Eike Ziller 6bc9cddb9e Merge remote-tracking branch 'origin/4.15' into 5.0 ...

Conflicts:
	src/plugins/cmakeprojectmanager/projecttreehelper.cpp
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee

2021-06-24 10:43:10 +02:00

18 KiB

Raw Blame History

View Raw