]> 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: e6f3da4 445bfe8)
Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <fruitiex@gmail.com>
Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)

Trivial merge