]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_updates
authorSamual Lenks <samual@xonotic.org>
Thu, 12 Sep 2013 16:29:37 +0000 (12:29 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 12 Sep 2013 16:29:37 +0000 (12:29 -0400)
commit719b47d60479f233baa8719e66e73a60bff28176
tree2306d5faa4509436bb95a299a2245ff79b5dfad8
parentd719b4d3b3edb3a675c121c5942ede0d92cd1ceb
parent43820f59de0be2bb0254bd6c235cce4c5858c672
Merge remote-tracking branch 'origin/master' into samual/notification_updates

Conflicts:
qcsrc/client/announcer.qc
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
15 files changed:
qcsrc/common/notifications.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/scores.qc
qcsrc/server/sv_main.qc