]> 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: e251657 bf62140)
Merge branch 'Mario/mapinfo_title_fix' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 21 Oct 2018 17:19:27 +0000 (17:19 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 21 Oct 2018 17:19:27 +0000 (17:19 +0000)
Merge branch Mario/mapinfo_title_fix (XXS merge request)

Closes #2086

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


Trivial merge