]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into samual/keepaway
authorSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:25:05 +0000 (10:25 -0500)
committerSamual <samual@xonotic.org>
Thu, 13 Jan 2011 15:25:05 +0000 (10:25 -0500)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge