]> 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: 98496b8 143a31b)
Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)

Trivial merge