]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:41:18 +0000 (08:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:41:18 +0000 (08:41 +0200)
commit97edc5b849cb78339799097d54ef17e833125be4
tree87563d14f666a0bea92eb0bb7e4dac28ec5a6ed8
parent1a67c86e6ce87ba731a5e806430066222361a7ff
parent4d5d9e7e063373b57e5b86ff43034acc86bc6275
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'