]> 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: 79c96ff 8802dc7)
Merge branch 'master' into terencehill/LMS_improvements 394/head
authorterencehill <piuntn@gmail.com>
Sun, 27 Nov 2016 23:23:32 +0000 (00:23 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 27 Nov 2016 23:23:32 +0000 (00:23 +0100)

Trivial merge