From: terencehill <piuntn@gmail.com>
Date: Sat, 5 Feb 2022 11:01:52 +0000 (+0000)
Subject: Merge branch 'Juhu/lmsrot' into 'master'
X-Git-Tag: xonotic-v0.8.5~213
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f436e8cf30c61ab2efffb0cd7285c5b3d1c1462;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Juhu/lmsrot' into 'master'

Allow rot and regeneration to be enabled individually in LMS

Closes #2555

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

9f436e8cf30c61ab2efffb0cd7285c5b3d1c1462