Magnus Norddahl 0855418475 Merge branch 'gzdoom' into materials ... # Conflicts: # src/gl/shaders/gl_shader.cpp # src/gl/shaders/gl_shader.h		2018-01-25 19:21:19 +01:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge branch 'gzdoom' into materials	2018-01-25 19:21:19 +01:00