-
Eike Ziller authored
Conflicts: share/share.qbs src/plugins/cpptools/cppchecksymbols.cpp src/plugins/texteditor/behaviorsettingswidget.cpp Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
ba1d5f2c
Conflicts: share/share.qbs src/plugins/cpptools/cppchecksymbols.cpp src/plugins/texteditor/behaviorsettingswidget.cpp Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37