-
Eike Ziller authored
Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h Change-Id: I4e786745e8abab8d15b75fd962c21b4b28620d47
c6f965f7
Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h Change-Id: I4e786745e8abab8d15b75fd962c21b4b28620d47