diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:26:13 +0200 |
| commit | 1434a793c97bd5746679b6b278d03b441a851674 (patch) | |
| tree | 837cc13b45994850d07a063c0d8d30d062caf801 | |
| parent | 1dc642bf3fdfb05280236f2bed13ee86e9a46218 (diff) | |
| parent | bc93c7c79085ee26162cbc6796bf99d2a4f6adfb (diff) | |
| download | qtgraphicaleffects-1434a793c97bd5746679b6b278d03b441a851674.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I7fd0ea8631fc0f5e9228781afe66b3dda9d73f59
0 files changed, 0 insertions, 0 deletions