Merge commit '11d93cb0302bdc3bc6afee65c4e253d4ecdc4b04'

Browse source

# 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

parent 0362deefc4 11d93cb030

commit 2044003542

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 is not available