]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Fri, 14 Dec 2012 10:14:00 +0000 (05:14 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 14 Dec 2012 10:14:00 +0000 (05:14 -0500)
1  2 
qcsrc/client/scoreboard.qc

Simple merge