Magnus Norddahl 0855418475 Merge branch 'gzdoom' into materials ... # Conflicts: # src/gl/shaders/gl_shader.cpp # src/gl/shaders/gl_shader.h		2018-01-25 19:21:19 +01:00
..
static	Merge branch 'gzdoom' into materials	2018-01-25 19:21:19 +01:00
CMakeLists.txt	- missed one qzdoom reference	2017-07-20 06:45:08 -04:00