Merge remote-tracking branch 'origin/master' into samual/notification_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
commitd719b4d3b3edb3a675c121c5942ede0d92cd1ceb
tree0768072542944fa4033bdde713d3e80d2c0cd52a
parent69baf80f2b53994c0181240bd39ad878ac87ca7e
parent23ed395422686ddcf2b10d3c2d02038a5ac4e2fb
Merge remote-tracking branch 'origin/master' into samual/notification_updates
qcsrc/common/util.qh
qcsrc/server/command/common.qc
qcsrc/server/g_world.qc