From: Mirio <opivy@hotmail.de>
Date: Wed, 26 Oct 2016 22:36:09 +0000 (+0000)
Subject: Merge branch 'packer/vorix' into 'master'
X-Git-Tag: xonotic-v0.8.2~131
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82f075815f96154d5b02c771c53280c1e95c4dc9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/vorix' into 'master'

some fixes (vorix)

- updated location names (some locations are named based on weapon names)
- fixed positioning of some barrels
- fixed textures in some lava spot

See merge request !53
---

82f075815f96154d5b02c771c53280c1e95c4dc9