]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Sat, 29 Oct 2011 18:45:18 +0000 (14:45 -0400)
committerSamual <samual@xonotic.org>
Sat, 29 Oct 2011 18:45:18 +0000 (14:45 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/autocvars.qh

Simple merge
Simple merge
Simple merge