From: Mario <mario.mario@y7mail.com>
Date: Mon, 19 Oct 2020 10:08:47 +0000 (+1000)
Subject: Merge branch 'master' into Mario/model_stair_smoothing
X-Git-Tag: xonotic-v0.8.5~716^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d5295bb4213f6c703d43d158605efe893514ee4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/model_stair_smoothing
---

9d5295bb4213f6c703d43d158605efe893514ee4