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)
commit8a4867ce715f19ce9b143a98443dcb0294a23ba6
tree1243b649b0ea59c9a0e417ca0d8ebcf4d5593329
parent64abe0b411c59b5c75dcef50e5a78b6c02dcfca7
parentcd1581daf5ea8b0ecdb6a726db448d553fc626f1
Merge branch 'Mario/fix_me' into 'master'

Merge branch Mario/fix_me (XS merge request)

Closes #2120

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