From: terencehill <piuntn@gmail.com>
Date: Sat, 23 May 2020 20:40:41 +0000 (+0000)
Subject: Merge branch 'Mario/frozen_floating' into 'master'
X-Git-Tag: xonotic-v0.8.5~1036
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c0b22c63c7bcc25fb183db754dd3ddd836ecde6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/frozen_floating' into 'master'

Merge branch Mario/frozen_floating (M merge  request)

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

9c0b22c63c7bcc25fb183db754dd3ddd836ecde6