From: Mario Date: Sun, 3 Jul 2016 23:12:12 +0000 (+1000) Subject: Merge remote-tracking branch 'origin/DefaultUser/damagetext_friendlyfire' X-Git-Tag: xonotic-v0.8.2~700^2~104 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=284c92dabbbdfcbb511e2688204622c5dcf01ac1 Merge remote-tracking branch 'origin/DefaultUser/damagetext_friendlyfire' --- 284c92dabbbdfcbb511e2688204622c5dcf01ac1