diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /examples/quick/shadereffects/content/shaders/+qsb/shadow.frag | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'examples/quick/shadereffects/content/shaders/+qsb/shadow.frag')
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/shadow.frag | bin | 2151 -> 1745 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag b/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag Binary files differindex 128af21daa..8059fab6ac 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag |