]> 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: b6d1756 b32f68b)
Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 19 Jul 2010 19:32:22 +0000 (22:32 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 19 Jul 2010 19:32:22 +0000 (22:32 +0300)

Trivial merge