From: Mirio <opivy@hotmail.de>
Date: Fri, 17 Jan 2020 23:58:50 +0000 (+0000)
Subject: Merge branch 'bones_was_here/mapinfoupdate' into 'master'
X-Git-Tag: xonotic-v0.8.5~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d7de98e8c81777430b7c16b3c093b71d38498cd;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'bones_was_here/mapinfoupdate' into 'master'

Remove blacklisted r_water clientsettemps and add gametype duel to appropriate maps

See merge request xonotic/xonotic-maps.pk3dir!142
---

0d7de98e8c81777430b7c16b3c093b71d38498cd