nashmuhandes 57112742fe Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2 ... # Conflicts: # src/common/rendering/gl/gl_shader.cpp # src/common/rendering/hwrenderer/data/buffers.h # src/common/rendering/v_video.h		2022-01-16 01:57:38 +08:00
..
data	Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2	2022-01-16 01:57:38 +08:00
postprocessing	- removed most templates.h includes.	2021-10-30 10:49:12 +02:00
hw_draw2d.cpp	- Backend update from Raze.	2022-01-02 11:39:17 +01:00