-
Eike Ziller authored
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/cpptools/cppmodelmanager.cpp src/plugins/texteditor/basetexteditor.cpp src/plugins/texteditor/basetexteditor.h Change-Id: I556a7661872b90b329a46694e335e18cddc28677
d6c73653
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/cpptools/cppmodelmanager.cpp src/plugins/texteditor/basetexteditor.cpp src/plugins/texteditor/basetexteditor.h Change-Id: I556a7661872b90b329a46694e335e18cddc28677