Magnus Norddahl ecb57d6cd9 Merge remote-tracking branch 'gzdoom/master' into ssao ... # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/scene/gl_scene.cpp # src/gl/shaders/gl_shader.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.zz		2016-10-04 00:01:03 +02:00
..
static	Merge remote-tracking branch 'gzdoom/master' into ssao	2016-10-04 00:01:03 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00