]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/change_default_balance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 28 Mar 2011 16:57:51 +0000 (18:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 28 Mar 2011 16:57:51 +0000 (18:57 +0200)
1  2 
balance25.cfg
balanceLeeStricklin.cfg
balanceSamual.cfg
balanceXonotic.cfg
balancetZork.cfg
qcsrc/server/autocvars.qh

diff --cc balance25.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge