]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 17:30:34 +0000 (12:30 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 17:30:34 +0000 (12:30 -0500)
commitb9cede9d0dad5c70fb3d3248d27d625bac7fbf2b
tree0400e4e01946ff4440a3876830f5d9852c990716
parentc9721204ea3db03cdee27f44698351229e79134f
parent62235594863059c5ad9fa7b1d8fa5bef1e21dbfd
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/csqcmodel_hooks.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc