Merge branch 'Mario/frozen_floating' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 23 May 2020 20:40:41 +0000 (20:40 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 23 May 2020 20:40:41 +0000 (20:40 +0000)
commit9c0b22c63c7bcc25fb183db754dd3ddd836ecde6
tree2d0c7a3c5958674d943b4a0c8fe412f4b11c5320
parent08de67582b273561e4e75f5fc51e5d3cefb74a2f
parent1be16938d890b6cefb5c5a176ea1dd886a479321
Merge branch 'Mario/frozen_floating' into 'master'

Merge branch Mario/frozen_floating (M merge  request)

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