-
Committer:
Frederik Gladhorn
-
Date:
2015-01-19 12:55:27 UTC
-
mfrom:
(86.1.12)
-
Revision ID:
git-v1:08a64a9a81b9b1366b0085a413cd9fc2fd0e3370
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I72c06814a05ac09cb498d4af89dc9e7d791e6cce