3f3f5a5359
Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :) |
||
---|---|---|
.. | ||
blur.glsl | ||
canvas.glsl | ||
canvas_shadow.glsl | ||
copy.glsl | ||
material.glsl | ||
SCsub |
3f3f5a5359
Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :) |
||
---|---|---|
.. | ||
blur.glsl | ||
canvas.glsl | ||
canvas_shadow.glsl | ||
copy.glsl | ||
material.glsl | ||
SCsub |