Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork
authorunknown <jm@.(none)>
Wed, 10 Nov 2010 00:04:44 +0000 (01:04 +0100)
committerunknown <jm@.(none)>
Wed, 10 Nov 2010 00:04:44 +0000 (01:04 +0100)
1  2 
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg

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