• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.8' · 63ff7452
    Eike Ziller authored
    Conflicts:
    	src/libs/extensionsystem/pluginmanager.cpp
    	src/libs/extensionsystem/pluginspec.cpp
    	src/plugins/coreplugin/basefilewizard.cpp
    	src/plugins/coreplugin/coreplugin.pro
    	src/plugins/coreplugin/coreplugin.qbs
    	src/plugins/coreplugin/editormanager/ieditor.cpp
    	src/plugins/coreplugin/externaltool.cpp
    	src/plugins/coreplugin/icore.cpp
    	src/plugins/cpptools/cppmodelmanager.cpp
    	src/plugins/fakevim/fakevimhandler.cpp
    	src/plugins/find/ifindfilter.cpp
    	src/plugins/projectexplorer/buildstep.cpp
    	src/plugins/projectexplorer/devicesupport/idevice.cpp
    	src/plugins/projectexplorer/runconfiguration.cpp
    	src/plugins/vcsbase/vcsbaseeditor.cpp
    	tests/system/suite_debugger/tst_simple_analyze/test.py
    
    Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
    63ff7452
cpppointerdeclarationformatter.cpp 18.1 KB