Merge remote branch 'origin/master' into tzork/balance-tzork
authorunknown <jm@.(none)>
Thu, 11 Nov 2010 00:05:50 +0000 (01:05 +0100)
committerunknown <jm@.(none)>
Thu, 11 Nov 2010 00:05:50 +0000 (01:05 +0100)
commitff35e838d3cfa0162951d604d213e48aeb771e80
treebaed5e6019716d89555ffb9fd772237deff659c6
parent994e2e010d2ca496b8fb6bdafcd0b6824d97e20f
parentc445450d257558c3426fc87a1d95fab4d03ce0a9
Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
balancetZork.cfg
qcsrc/server/w_crylink.qc
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/w_crylink.qc