]> 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>
Thu, 27 Dec 2012 14:10:05 +0000 (09:10 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 27 Dec 2012 14:10:05 +0000 (09:10 -0500)
commit8f90110cc3ea63d06689743e2aa8fc144d9b9b18
tree4b17f494895473f798b38ff3b7e42832424e2a19
parent3b4538464212cdef7e377e6e203e820178a76fe6
parentc927fe407ea582cd310d6e0b7309221d0145e3c2
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/server/g_damage.qc
qcsrc/server/cl_client.qc