]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/misc_cleanups' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:19:00 +0000 (05:19 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:19:00 +0000 (05:19 +0000)
Terencehill/misc cleanups

Miscellaneous cleanups and some small fixes

See merge request !46

1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_nexball.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge