]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfbbf2c0ff39e3521ca31837b6b8d584fd7616361
tree01696a1516b5e1d41482e55f1c08b7d85181bc2c
parent128cea32714586feb51b4a0d78a6bd4e35fef9f2
parent4566767f430d7a15f918d80b234f04c71f929b4e
Merge branch 'master' into Mario/physics
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc