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

Merge remote-tracking branch 'origin/2.7' into 2.8 

Conflicts:
	qtcreator.pri

Change-Id: I6726277830ddbd3b21391b5c5e48880929a2d725
parents fbdbd11a 7724bd46
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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