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

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

Conflicts:
	.qmake.conf

Change-Id: I1a3ce01707f9a09f7370479a97a8d8a738881389
parents f7ac18b4 64dcf54e
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 293 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