]> 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: 6480ab1 1d02cfb)
Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:51:12 +0000 (19:51 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:51:12 +0000 (19:51 +0300)

Trivial merge