-
Committer:
Frederik Gladhorn
-
Date:
2014-12-17 15:53:07 UTC
-
mfrom:
(86.1.10)
-
Revision ID:
git-v1:dc1b01aed6191f9977e28e3763cdd2c4cb88d22b
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6