]> 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: 64abe0b cd1581d)
Merge branch 'Mario/fix_me' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 14 Jan 2019 15:27:54 +0000 (15:27 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 14 Jan 2019 15:27:54 +0000 (15:27 +0000)
Merge branch Mario/fix_me (XS merge request)

Closes #2120

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


Trivial merge