doom3-bfg/base
Robert Beckebans 195f8082b8 Merge branch 'SMAA' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	neo/renderer/RenderProgs_GLSL.cpp
	neo/renderer/RenderProgs_embedded.h
2015-12-30 10:08:25 +01:00
..
renderprogs Merge branch 'SMAA' into HDR-linearRGB 2015-12-30 10:08:25 +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