Skip to content
GitLab
Commit e7c23092 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/stable' into dev 

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I6b08ce96935cf082c83496c521a9c1527f1321c4
parents 3606f287 b3aa3fe1
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 5 deletions
Supports Markdown
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