raa-eruanna c6408e92e2 Merge http://github.com/coelckers/gzdoom ... # Conflicts: # src/gl/renderer/gl_postprocess.cpp # src/gl/renderer/gl_renderer.cpp # src/gl/scene/gl_scene.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.zz		2016-10-02 23:10:07 -04:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge http://github.com/coelckers/gzdoom	2016-10-02 23:10:07 -04:00