Viewing all changes in revision 171.

Committer: Frederik Gladhorn
Date: 2015-01-19 12:55:16 UTC
mfrom: <a title="Merged From 164.1.10" href="/~neon/qt/qtgraphicaleffects/revision/164.1.10">(164.1.10)
Revision ID: git-v1:a1897106ce1306c1083bff05493a760e11bd19c7

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

Conflicts:
.qmake.conf

Change-Id: I4f99c72926a0d0ac0b79f89a0f8f4234685b0ac3

added added

removed removed

~neon/qt/qtgraphicaleffects