projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a92c34 d77f78e)
Merge branch 'master' into terencehill/scoreboard_stuff 592/head
authorterencehill <piuntn@gmail.com>
Thu, 13 Sep 2018 11:58:20 +0000 (13:58 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 13 Sep 2018 11:58:20 +0000 (13:58 +0200)

Trivial merge