]> 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: 219b3f9 1ea927c)
Merge branch 'sev/hud_teamkill_icons'
authorMirio <opivy@hotmail.de>
Fri, 13 Nov 2015 18:29:58 +0000 (19:29 +0100)
committerMirio <opivy@hotmail.de>
Fri, 13 Nov 2015 18:29:58 +0000 (19:29 +0100)

Trivial merge