]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 21:14:38 +0000 (22:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 21:14:38 +0000 (22:14 +0100)
commitf127db4521b7fbed9bac9ff56ac1731b51f5a6c3
tree9bd85346b9cde34fe3498204ee6852ccac8de06c
parent23746186add00c053fb47180fba17e25393da956
parent0874b330f0ccab996c658c73c23e267626c7d2df
Merge branch 'master' into divVerent/csqcmodel
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc