con eef08b12e3 Merge remote branch 'origin/2.0' ...

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

2010-07-16 11:50:01 +02:00

264 KiB

Raw Blame History

View Raw