diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:52:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:52:52 +0200 |
| commit | f536e36e3188903404fac78064ea7872dd8cc0d2 (patch) | |
| tree | e9168f03d1083a824896236749617ff8e997f7a7 /src/effects/effects_plugin.pro | |
| parent | f28b63795b7d9c8767899302929404d6a6dabdbe (diff) | |
| parent | 0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: Ia90dc78a2c9340095d4dd0c050c1e20a895a3763
Diffstat (limited to 'src/effects/effects_plugin.pro')
0 files changed, 0 insertions, 0 deletions