]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Tue, 4 Dec 2012 16:37:20 +0000 (17:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 4 Dec 2012 16:37:20 +0000 (17:37 +0100)
commit5d57b7221cb0a7e1e3b4d4eb78977ac1d2abb108
tree8a4f26997c899279d82d650724a9a502c712b656
parent7caeb633574128f303cdcab2ff00144923a94926
parent77c8f18d6cf54ac0c0b1e426ac79842e7f593c80
Merge remote-tracking branch 'origin/master' into divVerent/csad
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh