]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/crbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 20:42:10 +0000 (21:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 20:42:10 +0000 (21:42 +0100)
commit477edde098979fa53cd3304d26dfec00e41003b5
treec2cef04c883884fc2a50ade817cf5e189d15599a
parentbbb19a777cb6a667bf682fb07d48b611e176f06b
parent0a79c752ef14e16ad87d63940c5b9f6f7b2bbddf
Merge remote branch 'origin/fruitiex/crbalance'