]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge