]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/client/csqcmodel_hooks.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge