Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
commitb49a2cd1f819e03ebb72db44594d2e336201d73e
tree8972333664a703c88f3f21032547bddd530efa4c
parentea2bf33373f52c67a94bd1ba8ad6a39c1da800be
parentea592a675e07f17e28f65aa7bfe46ebd5d4bf6e3
Merge remote branch 'origin/fruitiex/fruitbalance'
balanceXonotic.cfg