Skip to content
Snippets Groups Projects
Commit eef08b12 authored by con's avatar con
Browse files

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
parents 41236d29 2b3db205
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 12 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment