diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:44:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:06:59 +0100 |
| commit | ffd05a99843216878e61c2e2c11e317f3f9fdfae (patch) | |
| tree | b0d8d3bbd6c64ab8beb4770941ff6334097bd24c /src/effects/shaders/+glslcore/fastblur.frag | |
| parent | 045174c411f89863165610c1f6135ef4bd3d0889 (diff) | |
| parent | 7ab12ad1483607cf3f007c591e998f40f2ec9513 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
src/effects/private/qgfxshaderbuilder_p.h
Change-Id: I27fbd2a8d7bf5bd89d94925a2da9ae3aa0748f42
Diffstat (limited to 'src/effects/shaders/+glslcore/fastblur.frag')
0 files changed, 0 insertions, 0 deletions