]> 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: 5378847 0a9d433)
Merge branch 'terencehill/lms_fix'
authorterencehill <piuntn@gmail.com>
Sat, 25 Jan 2020 12:42:12 +0000 (13:42 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 25 Jan 2020 12:42:12 +0000 (13:42 +0100)

Trivial merge