Merge remote branch 'origin/master' into tzork/balance-tzork
authorunknown <jm@.(none)>
Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
committerunknown <jm@.(none)>
Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
commit50fae2ffe748fce0c54b20ef168a702f9607b8db
tree055f2bb3c45d90b673c062b4c3d31b6b09699414
parente3449b33968c2562dcb06287b4a06562de8dcb67
parentcbe4b5d591880e2df192dabe8043d7ff898520f1
Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
balancetZork.cfg
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg