Merge remote branch 'origin/tzork/balance-tzork'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 08:37:22 +0000 (09:37 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 08:37:22 +0000 (09:37 +0100)
commit30fdaa8e05b537534caf89e6a8601478e1a1c9cf
treed5e64c869d5a27d68ff21d0cf39f101f4ad8547f
parentb49a2cd1f819e03ebb72db44594d2e336201d73e
parent59865d98f65068bde3ab2cd06257130927f4fa48
Merge remote branch 'origin/tzork/balance-tzork'
balanceXonotic.cfg
qcsrc/server/w_crylink.qc