Merge branch 'martin-t/watermark' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:08:17 +0000 (05:08 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:08:17 +0000 (05:08 +0000)
commit67055d9b0103e4342e671af3a6568908b2d35bde
treeba38affbc6da5b1ddb3088c5cc698dad4ae14aef
parent393b4baee3cfc687e529aa6377b4ce9776cb066b
parent966ed528c051074bbc013628c15d046c6cdbc77a
Merge branch 'martin-t/watermark' into 'master'

Don't draw the watermark

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