src/plugins/help/helpplugin.cpp · 65e11062bb1671328e16736db9f2668ba87e5edb · Tobias Hunger / qt-creator

15 years ago

Oswald Buddenhagen authored 15 years ago

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp

913f6161

Oswald Buddenhagen authored 15 years ago

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp