]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:06:45 +0000 (14:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:06:45 +0000 (14:06 +0100)
commit30016be3301606bd261f442ebf74dc796567ffa1
tree8c1d693059dba045fd4cf20e33588d4dcb10b2e5
parent41c9e3508cb2a3a681eb7fed31b7e230b065c797
parent5917289c43bd7f3ad19e4bb3927cd44ee51e523a
Merge remote branch 'origin/fruitiex/balance'
balanceXonotic.cfg