Commit 394b7bc8 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ifee77abab352e92b52a2ddba16447107005e3253
parents 759b6b12 df320bec
Branches
Tags
No related merge requests found
Showing with 2 additions and 0 deletions
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