Christoph Oelckers 12d073a27d - objectcolor stuff. ... # Conflicts: # src/gl/renderer/gl_renderstate.cpp		2017-01-28 19:06:21 +01:00
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	- objectcolor stuff.	2017-01-28 19:06:21 +01:00