diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 19:59:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 19:59:58 +0200 |
| commit | 8a28462c13907800caf44c16580e0b2a2ee99f69 (patch) | |
| tree | e6d1e5d9179dac8edb4d87017442ef8194c80cac /src/quick/items/qquickshadereffectsource.cpp | |
| parent | b3c2c28746a01f435580b9fbad64d4f614e7f805 (diff) | |
| parent | 800025fb70ace453275011c1ae5ce906e0fa3344 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickshadereffectsource.cpp')
0 files changed, 0 insertions, 0 deletions