]> 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: f507e6c a2f6e89)
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)

Trivial merge