Skip to content
GitLab
Commit 12450d0e 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: I0c7564e03a51df9aba7dd53640802e318417bd0e
parents e44e545c cb98d951
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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