]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha
authorSamual Lenks <samual@xonotic.org>
Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)
commitdf2cf141547e4df971d310e2e09bbf1e8d008963
tree5c2c579b82d29729729002c8f7f8a33c75fd765d
parent0ecf24858b4d35b25c121ee61a9eab391a493835
parentcf8895a5790c2ae048c71e0f53bae6409a5500c1
Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha