]> 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:50:28 +0000 (12:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 17:50:28 +0000 (12:50 -0500)
commitc545b26a7c733e02bfac2aad2a52ffd747202ba9
treea204b970bf3d59d1d8f1844e968b091be09a3f6e
parentb9cede9d0dad5c70fb3d3248d27d625bac7fbf2b
parent64d58e3d7b97cf1c2e27628107dd3876f82f9992
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/server/g_damage.qc