]> git.xonotic.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:50:28 +0000 (12:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 17:50:28 +0000 (12:50 -0500)
1  2 
qcsrc/server/g_damage.qc

Simple merge