-
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