-
Oswald Buddenhagen authored
Conflicts: src/plugins/cpptools/cppcodecompletion.cpp src/plugins/help/helpplugin.cpp src/plugins/projectexplorer/projectexplorer.cpp
913f6161
Conflicts: src/plugins/cpptools/cppcodecompletion.cpp src/plugins/help/helpplugin.cpp src/plugins/projectexplorer/projectexplorer.cpp