]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 393b4ba 966ed52)
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)
Don't draw the watermark

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


Trivial merge