Merge branch 'master' into gonesolong

Browse source

Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj

...

This commit is contained in:

Randy Heit 2014-12-20 19:11:39 -06:00

parent ec6624dfc7 bf0856aef5

commit 2d87eb0ba2

457 changed files with 13703 additions and 9290 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

1817

src/p_map.cpp

View file

File diff suppressed because it is too large Load diff