From: Mario <zacjardine@y7mail.com>
Date: Fri, 25 Aug 2017 10:28:37 +0000 (+0000)
Subject: Merge branch 'marin-t/nadectr' into 'master'
X-Git-Tag: xonotic-v0.8.5~2511
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=83e2013a3aa40f8e5cfeac82e83c9abdd7a038b8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'marin-t/nadectr' into 'master'

Remove `dppolygonoffset -6000` from nade countdown shader

See merge request !466
---

83e2013a3aa40f8e5cfeac82e83c9abdd7a038b8