doom3-bfg/base
Robert Beckebans 29f5488c89 Merge branch 'SSGI' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	base/renderprogs/interactionAmbient.pixel
	neo/renderer/OpenGL/gl_Image.cpp
	neo/renderer/RenderProgs_embedded.h
2016-01-11 19:35:34 +01:00
..
renderprogs Merge branch 'SSGI' into HDR-linearRGB 2016-01-11 19:35:34 +01:00
default.cfg Workarounds for Mesa. closes #256 #245 2015-11-23 14:01:59 +01:00
extract_resources.cfg Added extract_resources.cfg for modding purposes 2014-05-22 11:35:47 +02:00