]> 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 | combined (merge: 13ef8c6 d96d5e5)
Merge branch 'master' into terencehill/scoreboard_update
authorterencehill <piuntn@gmail.com>
Sun, 4 Sep 2016 20:44:09 +0000 (22:44 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 4 Sep 2016 20:44:09 +0000 (22:44 +0200)

Trivial merge