Christoph Oelckers 33ee0f3c27 Merge branch 'master' into modern ... # Conflicts: # src/gl/renderer/gl_renderer.cpp # src/gl/renderer/gl_renderer.h # src/gl/renderer/gl_renderstate.h # src/gl/system/gl_framebuffer.cpp # src/gl/system/gl_framebuffer.h		2018-07-14 13:18:34 +02:00
..
gl_debug.cpp	- gl_system.h as well, in particular this has no place in hw_* files.	2018-05-16 23:34:52 +02:00
gl_debug.h	- moved gl_interface.cpp/h to gl_load folder.	2018-05-16 23:21:21 +02:00
gl_framebuffer.cpp	Merge branch 'master' into modern	2018-07-14 13:18:34 +02:00
gl_framebuffer.h	Merge branch 'master' into modern	2018-07-14 13:18:34 +02:00
gl_wipe.cpp	Merge branch 'master' into modern	2018-07-14 13:18:34 +02:00