Merge branch 'master' into scripting

Browse source

Conflicts:
	src/g_shared/a_debris.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp

...

This commit is contained in:

Christoph Oelckers 2016-01-19 16:11:05 +01:00

parent 1faf68794b 97620b0645

commit 354b55c0a3

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