]> 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: ff27bb7 9bd9673)
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:23:19 +0000 (17:23 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:23:19 +0000 (17:23 +0200)

Trivial merge