mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-26 22:21:26 +00:00
Merge remote-tracking branch 'origin/setcolormaplight' into qzdoom
# Conflicts: # src/r_draw.cpp # src/r_draw.h # src/r_main.h # src/r_plane.cpp # src/r_things.cpp # src/v_draw.cpp
This commit is contained in:
commit
fc54f6746a