Merge remote-tracking branch 'origin/4.12' into 4.13

Browse Source

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

Change-Id: Icb405079fd601619b506e5c56b6ef465bc0424bc

...

This commit is contained in:

Eike Ziller

2020-07-08 11:01:43 +02:00

parent b508a98e6a 88b9ef5c5b

commit 5fa442434a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available