diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-21 19:24:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-21 19:24:06 +0000 |
| commit | a03eb67a786788511302a8ac3ecc809002408fed (patch) | |
| tree | 48272e563d4f94781afb909a8773c4fbb428e39a /src/quick/items/qquickshadereffect.cpp | |
| parent | 84b51ca931e6a673738c59ac4686340c4199e203 (diff) | |
| parent | 43431619d644ebd783d292a12c1904cfd7680824 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
0 files changed, 0 insertions, 0 deletions