Eike Ziller d95e1f940a Merge remote-tracking branch 'origin/4.14' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I5b8d93f2f08b62626c3f3447728c64d198b601ff

2021-01-04 09:09:21 +01:00

34 KiB

Raw Blame History

View Raw