]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sun, 13 Jan 2013 18:50:49 +0000 (13:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 13 Jan 2013 18:50:49 +0000 (13:50 -0500)
commit8db035f374df1c19ea24531f8a96f04625f5f559
tree345da21faed5bc088ea3c32333f825c83996179b
parentab91bdd7aa71b3cf78101ec6086bbf4609e8beea
parent52e76c4e559d3c4d3f963c2a5feecc226d50e829
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/scoreboard.qc
qcsrc/server/race.qc
qcsrc/server/scores.qc