]> 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: 1a67c86 4d5d9e7)
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:41:18 +0000 (08:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 06:41:18 +0000 (08:41 +0200)

Trivial merge