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