From: Mario <mario.mario@y7mail.com>
Date: Sun, 24 May 2020 11:41:02 +0000 (+0000)
Subject: Merge branch 'terencehill/frozen_resurfacing' into 'master'
X-Git-Tag: xonotic-v0.8.5~1033
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cafa715c95c3f8fefd84f80e11a57c20b1108eb7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/frozen_resurfacing' into 'master'

Frozen resurfacing

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

cafa715c95c3f8fefd84f80e11a57c20b1108eb7