forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5
36 KiB
36 KiB
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5