raa-eruanna 2a7b902a0a Merge http://github.com/coelckers/gzdoom ... # Conflicts: # src/gl/renderer/gl_renderer.cpp		2016-10-10 10:39:07 -04:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge http://github.com/coelckers/gzdoom	2016-10-10 10:39:07 -04:00