Merge remote-tracking branch 'zdoom/master' into qzdoom

Browse source

# Conflicts:
#	src/r_plane.cpp
#	src/r_segs.cpp

...

This commit is contained in:

Magnus Norddahl 2016-12-10 00:08:56 +01:00

parent d1379e26f5 902a4b839c

commit 012565228d

10 changed files with 1197 additions and 783 deletions

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

1137

src/r_walldraw.cpp Normal file

View file

File diff suppressed because it is too large Load diff