]> de.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>
Mon, 4 Feb 2013 23:13:07 +0000 (18:13 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 23:13:07 +0000 (18:13 -0500)
commit80ea2c26461cab2b2992f79643eaf59aacb7cda7
tree098f117fec7ea55178b732cdd26e938e15b3d628
parent1041c15ec862f383cdfc8a3b2e0188eb515805af
parentd205541c9121131a1caddd9180ed8befef596f15
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/server/teamplay.qc
qcsrc/server/attic/domination.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc