]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 432416c a79cdb9)
Merge branch 'Mirio/boil' into 'master'
authorMirio <opivy@hotmail.de>
Thu, 30 Nov 2017 18:41:26 +0000 (18:41 +0000)
committerMirio <opivy@hotmail.de>
Thu, 30 Nov 2017 18:41:26 +0000 (18:41 +0000)
Mirio/boil

Closes #139

See merge request xonotic/xonotic-maps.pk3dir!109


Trivial merge