]> 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: c50c892 2becc7f)
Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)

Trivial merge