]> 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: a7af3e7 57fc749)
Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)

Trivial merge