Merge branch 'Lyberta/NewItemNames' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 16 Apr 2018 09:33:40 +0000 (09:33 +0000)
committerMirio <opivy@hotmail.de>
Mon, 16 Apr 2018 09:33:40 +0000 (09:33 +0000)
Updated entities.ent.

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

1  2 
scripts/entities.ent

Simple merge