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)
commitd4a496548f33a19bae54c700639079dcf453dde1
tree939d196e83573e45b47e203136c10f645171a546
parent2da1811b47a472ed139e157fd9bd665e1027ddea
parenta73c41d6a3525f42bb3c6850123448ee7faa9c09
Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg