]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commite2671eb26f096af4023a0119bbc87a4801a5e66d
tree72e4b3d37295e48cd6a714418763768080f0ab53
parent670cdfb80ee861fdb7fbcbdb4de7a21863911fca
parentf7f36e7cb72f1c9709219b1fdc52e3f5dc3748d3
Merge remote-tracking branch 'origin/master' into fruitiex/borken_shownames