Merge remote-tracking branch 'origin/setcolormaplight' into qzdoom

Browse Source

# 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

parent d5d6bcc0fa bb3fa15bed

commit fc54f6746a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available