]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit6baaca28bc15a710c5dc79feb64685356048592b
treec6828e8d548204e6dc5f22b4d1b110023bfb88c5
parentd91b3e89615fe69b76d6e7f12327bf9efb03e1e6
parent674fe7a6e5b52f8641b6bfd1c529ae02fecb2be6
Merge remote-tracking branch 'origin/zykure/teamscores'