]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdbdc93 bb58127)
Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)

Trivial merge