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

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
parents 726c3345 2de4a98c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 139 additions and 124 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