]> 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: a69eeeb 0f24c77)
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:58:06 +0000 (11:58 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:58:06 +0000 (11:58 +0300)

Trivial merge