Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Sun, 9 Jan 2011 01:06:24 +0000 (03:06 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 9 Jan 2011 01:06:24 +0000 (03:06 +0200)
1  2 
balance25.cfg
balanceLeeStricklin.cfg
balanceSamual.cfg
balanceXonotic.cfg
balancetZork.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/g_damage.qc

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