]> 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: 81a7ac0 c45bfd7)
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats
authorFruitieX <fruitiex@gmail.com>
Fri, 20 May 2011 13:32:53 +0000 (16:32 +0300)
committerFruitieX <fruitiex@gmail.com>
Fri, 20 May 2011 13:32:53 +0000 (16:32 +0300)

Trivial merge