From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 26 Oct 2015 06:59:50 +0000 (+0000)
Subject: Merge branch 'TimePath/scoreboard_dmg' into 'master'
X-Git-Tag: xonotic-v0.8.2~1787
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff403a7c06eff0d662b2f32d435d37d47a6b9296;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/scoreboard_dmg' into 'master'

Damage on scoreboard



See merge request !130
---

ff403a7c06eff0d662b2f32d435d37d47a6b9296