Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/forced-teams-by...
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:52:16 +0000 (07:52 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:52:16 +0000 (07:52 +0100)
commit2fb0fbad033bca114c3f398c1a3869173917b8a4
tree595bacf42200bd32bf1178545999fbccb7c86128
parent67db774402e5812d5bde73d92606893f0443fc13
parentea592a675e07f17e28f65aa7bfe46ebd5d4bf6e3
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/forced-teams-by-idfp
balanceXonotic.cfg