gzdoom/wadsrc
Magnus Norddahl 38be2333d0 Merge branch 'exposure_pass' into lightmath
# Conflicts:
#	src/gl/renderer/gl_renderbuffers.cpp
#	src/gl/renderer/gl_renderbuffers.h
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_scene.cpp
2016-09-18 16:22:44 +02:00
..
static Merge branch 'exposure_pass' into lightmath 2016-09-18 16:22:44 +02:00
CMakeLists.txt Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-06 05:21:48 +01:00