diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:47:56 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:47:56 +0200 |
| commit | 3cfe3215e0382565805c35806a288331ba3ebffb (patch) | |
| tree | 4a1adcc8bdc821e298b16cf866838a4122d0f84b /src/effects/Desaturate.qml | |
| parent | e76754d8f53e12140898473fb0d1aa43c1051500 (diff) | |
| parent | 0560828b74bb4c6b98f738feac19b378ae4c0e61 (diff) | |
| download | qtgraphicaleffects-3cfe3215e0382565805c35806a288331ba3ebffb.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Iaee160172f27e36a8fa7c46a9f2154c6864d93de
Diffstat (limited to 'src/effects/Desaturate.qml')
0 files changed, 0 insertions, 0 deletions