Magnus Norddahl 818fcfea10 Merge remote-tracking branch 'qzdoom/shadowmaps' into qzdoom ... # Conflicts: # wadsrc/static/language.enu		2017-03-10 22:31:17 +01:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge remote-tracking branch 'qzdoom/shadowmaps' into qzdoom	2017-03-10 22:31:17 +01:00