From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Jun 2019 05:08:17 +0000 (+0000)
Subject: Merge branch 'martin-t/watermark' into 'master'
X-Git-Tag: xonotic-v0.8.5~1478
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67055d9b0103e4342e671af3a6568908b2d35bde;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/watermark' into 'master'

Don't draw the watermark

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

67055d9b0103e4342e671af3a6568908b2d35bde