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
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2	2022-01-16 01:57:38 +08:00
CMakeLists.txt	- bumped CMake version to 3.1.0 in all projects to reduce warning spam in recent versions.	2021-03-08 13:58:29 +01:00