]> 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: d91b3e8 674fe7a)
Merge remote-tracking branch 'origin/zykure/teamscores'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)

Trivial merge