Merge commit '9ac7a07be68419c20cfb8e97d50c253aa7a1bb6e'

# 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:
Rachael Alexanderson 2016-12-18 20:51:34 -05:00
commit d2bd65981d

Diff content is not available