Rachael Alexanderson 0c101102dc Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_bsp.cpp # src/r_main.cpp # src/r_segs.cpp # src/r_things.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.txt		2017-01-28 17:39:55 -05:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge https://github.com/coelckers/gzdoom	2017-01-28 17:39:55 -05:00