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:
Magnus Norddahl 2016-12-17 23:10:32 +01:00
commit fc54f6746a

Diff content is not available