forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc qbs/modules/qtc/qtc.qbs src/plugins/remotelinux/linuxdevicetester.cpp Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
50 KiB
50 KiB