diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:56:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:56:51 +0100 |
| commit | 74d92ef80f5e13f2e10a592e0389a10bbeab189e (patch) | |
| tree | b6aa6e592e98004c89d76e348ac5b05023cd7e38 /src/effects/doc/images/GammaAdjust_gamma3_graph.png | |
| parent | 7764833edf8f7ca8a53b4ea18688051ea010b70c (diff) | |
| parent | 24f3fd69a2e953619c48b4a632262ce8419fee40 (diff) | |
| download | qtgraphicaleffects-74d92ef80f5e13f2e10a592e0389a10bbeab189e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ia67a352bb51848428f8b907629c70ed340b57d78
Diffstat (limited to 'src/effects/doc/images/GammaAdjust_gamma3_graph.png')
0 files changed, 0 insertions, 0 deletions