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
..
d3d	Normalize line endings	2016-03-01 09:47:10 -06:00
glsl	Merge branch 'exposure_pass' into lightmath	2016-09-18 16:22:44 +02:00