]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 26f37b6 54e114c)
Merge branch 'terencehill/scoreboard_fixes'
authorMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 01:23:38 +0000 (12:23 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 01:23:38 +0000 (12:23 +1100)

Trivial merge