Merge branch 'master' of https://github.com/rheit/zdoom

Browse source

# Conflicts:
#	src/r_data/sprites.cpp

...

This commit is contained in:

Christoph Oelckers 2016-12-08 21:06:35 +01:00

parent 8a6d3b8e7b 3fbe41957d

commit 48d17f8fcb

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

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available