forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/libs/utils/multitextcursor.cpp Change-Id: I54b00ea5e6953078beed7673b5de31114f983bfa
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/libs/utils/multitextcursor.cpp Change-Id: I54b00ea5e6953078beed7673b5de31114f983bfa