]> 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>
Thu, 13 Dec 2012 03:53:41 +0000 (22:53 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 13 Dec 2012 03:53:41 +0000 (22:53 -0500)
commite1326a2cccc2d471cd11161ab7eda42dfe4d5d2f
treea2511ba3f46e454b8adf28922d8d1b16d0b961f7
parent74cb317eb10d44a2f21bd16c352092da742f880f
parent7de32704d7b8cfffdd701e143de8672d018e16e2
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/View.qc
qcsrc/client/scoreboard.qc
qcsrc/common/command/generic.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc