]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e262a40 67df79b)
Merge branch 'terencehill/scoreboard_stuff' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 22 Sep 2018 04:50:48 +0000 (04:50 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 22 Sep 2018 04:50:48 +0000 (04:50 +0000)
Scoreboard stuff

See merge request xonotic/xonotic-data.pk3dir!592


Trivial merge