Skip to content
Find file Blame History Permalink
  • con's avatar
    Merge remote branch 'origin/2.0' · b0040dc8
    con authored 
    Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
    b0040dc8