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)
commitaeeec0e420261a4839732689fe5103063f875dd7
treed839c310970fd58eb4bf3a52dcdf25b935568bdb
parentd5701c7ca1a78000df45b7da9a935566f00ca310
parentd514a9b0c52c841a489528e4e5db81825d5958a3
Merge branch 'Lyberta/NewItemNames' into 'master'

Updated entities.ent.

See merge request xonotic/xonotic-maps.pk3dir!110
scripts/entities.ent