Magnus Norddahl bcb64a3445 Merge branch 'ssao' into qzdoom ... # Conflicts: # src/gl/renderer/gl_postprocess.cpp # src/gl/renderer/gl_renderer.cpp # src/gl/scene/gl_scene.cpp # src/gl/shaders/gl_ambientshader.cpp # src/gl/shaders/gl_ambientshader.h # src/gl/system/gl_cvars.h # wadsrc/static/language.enu # wadsrc/static/menudef.zz		2016-10-03 23:47:09 +02:00
..
static	Merge branch 'ssao' into qzdoom	2016-10-03 23:47:09 +02:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00