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)
commitdb6ca2c6975b623df2ae3e460d3a372437d1ec5e
tree63fb4f758388d5fc40e0cbad87645e36168672b7
parent432416cc93dfa40c3899e8ad773b0194d87c3971
parenta79cdb9116e62bfafce732742845b8c66befc528
Merge branch 'Mirio/boil' into 'master'

Mirio/boil

Closes #139

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