src/plugins/texteditor/basefilefind.h · 16fcb82d088b7060cf4b4268b99e8a4b60ee3650 · Tobias Hunger / qt-creator

15 years ago

con authored 15 years ago

Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp

ddb78427

con authored 15 years ago

Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp