From: Mirio <opivy@hotmail.de>
Date: Mon, 16 Apr 2018 09:33:40 +0000 (+0000)
Subject: Merge branch 'Lyberta/NewItemNames' into 'master'
X-Git-Tag: xonotic-v0.8.5~122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aeeec0e420261a4839732689fe5103063f875dd7;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Lyberta/NewItemNames' into 'master'

Updated entities.ent.

See merge request xonotic/xonotic-maps.pk3dir!110
---

aeeec0e420261a4839732689fe5103063f875dd7