]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/shownames_fixes
authorSamual <samual@xonotic.org>
Tue, 30 Aug 2011 08:52:17 +0000 (04:52 -0400)
committerSamual <samual@xonotic.org>
Tue, 30 Aug 2011 08:52:17 +0000 (04:52 -0400)
commit07d12c6277ea8e7655cb5991c34f0d9cb4616c3d
treebb44ab7b5b2c29764a32e1afc9078938029617b1
parentf507e6cde66c4c2c91dff88438bbac804104e42b
parenta2f6e8933aa181a4d4c9286453cf4668bb464da7
Merge remote branch 'origin/master' into samual/shownames_fixes