From: Mario <mario.mario@y7mail.com>
Date: Thu, 9 Jan 2020 05:05:43 +0000 (+0000)
Subject: Merge branch 'bones_was_here/aggressorfix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0e9f99475626962eb2297e19597d1b2cd9e265f;p=xonotic%2Fxonotic-nexcompat.pk3dir.git

Merge branch 'bones_was_here/aggressorfix' into 'master'

Use correct path for eX_floor_mtl_grate_01 on aggressor (see: nexcompat-eX.shader)

See merge request xonotic/xonotic-nexcompat.pk3dir!1
---

e0e9f99475626962eb2297e19597d1b2cd9e265f