]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:48:27 +0000 (08:48 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:48:27 +0000 (08:48 +1000)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge