-
con authored
Conflicts: src/plugins/cpptools/cppfindreferences.cpp src/plugins/cpptools/cpptoolsplugin.cpp src/plugins/texteditor/basefilefind.cpp
ddb78427
Conflicts: src/plugins/cpptools/cppfindreferences.cpp src/plugins/cpptools/cpptoolsplugin.cpp src/plugins/texteditor/basefilefind.cpp