mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-16 01:21:17 +00:00
bafc5e6a3c
# Conflicts: # src/hwrenderer/scene/hw_drawinfo.cpp # src/hwrenderer/scene/hw_renderstate.cpp # src/hwrenderer/scene/hw_renderstate.h # src/hwrenderer/scene/hw_skyportal.cpp # src/hwrenderer/scene/hw_weapon.cpp # Conflicts: # src/g_level.cpp # src/gl/compatibility/gl_20.cpp # src/gl/renderer/gl_lightdata.cpp # src/gl/renderer/gl_renderstate.h # src/gl/scene/gl_skydome.cpp # src/gl/scene/gl_weapon.cpp # src/hwrenderer/scene/hw_weapon.cpp # src/hwrenderer/utility/hw_lighting.cpp |
||
---|---|---|
.. | ||
static | ||
CMakeLists.txt |