Merge commit '11d93cb0302bdc3bc6afee65c4e253d4ecdc4b04'

# Conflicts:
#	src/r_draw.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
This commit is contained in:
Rachael Alexanderson 2017-01-10 19:38:58 -05:00
commit 2044003542

Diff content is not available