qzdoom/wadsrc/static/shaders
Magnus Norddahl ecb57d6cd9 Merge remote-tracking branch 'gzdoom/master' into ssao
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
#	src/gl/scene/gl_scene.cpp
#	src/gl/shaders/gl_shader.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
2016-10-04 00:01:03 +02:00
..
d3d Normalize line endings 2016-03-01 09:47:10 -06:00
glsl Merge remote-tracking branch 'gzdoom/master' into ssao 2016-10-04 00:01:03 +02:00