Viewing all changes in revision 169.

Committer: Frederik Gladhorn
Date: 2014-10-20 17:12:55 UTC
mfrom: <a title="Merged From 164.1.6" href="/~neon/qt/qtgraphicaleffects/revision/164.1.6">(164.1.6)
Revision ID: git-v1:9a5ee9b9449f4046c8c9e690714d1d5f74ec0b51

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

Change-Id: I56d3c01f3ceffc318085a3cef8bd6cfe152f141e

added added

removed removed