Merge remote-tracking branch 'origin/fruitiex/fix_slap'
authormand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:16:44 +0000 (20:16 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 1 May 2011 23:16:44 +0000 (20:16 -0300)
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