]> 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: 9c510c1 11038d9)
Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)

Trivial merge