]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Sun, 15 May 2011 17:23:31 +0000 (13:23 -0400)
committerSamual <samual@xonotic.org>
Sun, 15 May 2011 17:23:31 +0000 (13:23 -0400)
commitab866f5b9b03d805aed5da8fe00e9ab51b7acf8f
treeb6b17099431ecd1b5b53ba9a8b6ad6fc7fd7678c
parent9217f0a954cc581e50461a7603b1f0aea718685e
parent1340e6da759fec548e48263e364c90a86614a2ec
Merge remote branch 'origin/master' into samual/flyingspectators
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc