Christoph Oelckers 82194bbf6b Merge branch 'master' into newrenderer ... # Conflicts: # source/games/exhumed/src/2d.cpp		2021-04-17 13:22:30 +02:00
..
gl
gl_load
hwrenderer
polyrenderer
vulkan
i_modelvertexbuffer.h
i_video.h
r_thread.cpp
r_thread.h
r_videoscale.cpp
r_videoscale.h
v_framebuffer.cpp
v_video.cpp
v_video.h