Skip to content
Find file Blame History Permalink
  • Oswald Buddenhagen's avatar
    Merge remote-tracking branch 'origin/2.8' · c2e90c36
    Oswald Buddenhagen authored 
    Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
    c2e90c36