]> 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: cb7498b 7f052d0)
Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:36:14 +0000 (02:36 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 23:36:14 +0000 (02:36 +0300)

Trivial merge