From: Mario <zacjardine@y7mail.com>
Date: Tue, 10 Oct 2017 07:16:27 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'
X-Git-Tag: xonotic-v0.8.5~2454
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05776c4204bf73c8ebc84e615ad088af45ebe5ed;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'

shaders: mark nade countdown texture with nopicmip keyword

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

05776c4204bf73c8ebc84e615ad088af45ebe5ed