]> 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: 97360f3 d978110)
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:26:32 +0000 (13:26 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:26:32 +0000 (13:26 +0200)

Trivial merge