Skip to content
  • con's avatar
    Merge remote branch 'origin/2.0' · eef08b12
    con authored
    Conflicts:
    	src/plugins/projectexplorer/buildmanager.cpp
    	src/plugins/projectexplorer/compileoutputwindow.cpp
    	src/plugins/projectexplorer/compileoutputwindow.h
    	src/plugins/projectexplorer/outputwindow.cpp
    	src/plugins/projectexplorer/outputwindow.h
    eef08b12