]> 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: 670cdfb f7f36e7)
Merge remote-tracking branch 'origin/master' into fruitiex/borken_shownames
authorFruitieX <fruitiex@gmail.com>
Wed, 13 Apr 2011 06:51:59 +0000 (09:51 +0300)
committerFruitieX <fruitiex@gmail.com>
Wed, 13 Apr 2011 06:51:59 +0000 (09:51 +0300)

Trivial merge