Merge branch 'master' into floatcvt

Browse Source

# Conflicts:
#	src/g_shared/a_quake.cpp

...

This commit is contained in:

Christoph Oelckers 2016-03-24 19:05:35 +01:00

parent 4874fe2361 a9ef8cc637

commit 53ea00b9cc

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 Not Available