Eike Ziller 623e607b23 Merge remote-tracking branch 'origin/4.12' ...

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

Change-Id: I19a7406f7e387b53f1e7b3f08a0b4c89a377ab82

2020-06-08 08:22:10 +02:00

9.7 KiB

Raw Blame History

View Raw