Skip to content
Snippets Groups Projects
Commit ab0c3da0 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.8' 

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
parents 113c5600 8b390350
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3511 additions and 1704 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