]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93af481 cbd696f)
Merge branch 'TimePath/scoreboard_dmg' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 06:59:50 +0000 (06:59 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 06:59:50 +0000 (06:59 +0000)
Damage on scoreboard

See merge request !130


Trivial merge