Magnus Norddahl 51f867bc6c Merge branch 'ssao' into qzdoom ... # Conflicts: # src/gl/renderer/gl_renderer.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.zz # wadsrc/static/shaders/glsl/main.fp		2016-10-04 00:16:05 +02:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge branch 'ssao' into qzdoom	2016-10-04 00:16:05 +02:00