]> 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: 1216175 58f3211)
Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)

Trivial merge