src/plugins/cpptools/cppcompletion_test.cpp · 44dd2b6bdf22c61889cae586fa463a3f56b2664c · Marco Bubke / flatpak-qt-creator

11 years ago

Merge remote-tracking branch 'origin/2.8' · a0b2d108

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb

a0b2d108

History

Merge remote-tracking branch 'origin/2.8'

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb