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

Merge branch 'Mario/waterjump_fix' into 'master'

Merge branch Mario/waterjump_fix (S merge request)

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

b7873b3470e961ee95d5823de13a87a63e7e0f3b