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

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

Conflicts:
	.qmake.conf

Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
parents dab03361 9a00d1a0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 292 additions and 297 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