]> 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: 901dc94 6035a1f)
Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 20:36:41 +0000 (22:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 20:36:41 +0000 (22:36 +0200)

Trivial merge