]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Sat, 1 Oct 2011 16:08:07 +0000 (12:08 -0400)
committerSamual <samual@xonotic.org>
Sat, 1 Oct 2011 16:08:07 +0000 (12:08 -0400)
commit1e926ffdd1dc18bdde7a189a54938ac205d39260
treefbbc54b27da54bb5c8471f91772d7bc41848cc25
parent0e8f5d03035b36902a64bb1d7f974cdec17cc9f7
parentbba4978faed0ce7058b1beaf827fd0d6af3fe0c8
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc