-
Committer:
Frederik Gladhorn
-
Date:
2015-01-19 13:09:01 UTC
-
mfrom:
(184.1.13)
-
Revision ID:
git-v1:8f012dd05873d33d0ce9dc7b076418cc3096106e
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059