someone forgot to merge the entities
authormrbougo <mrbougo@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 15 May 2009 14:29:33 +0000 (14:29 +0000)
committermrbougo <mrbougo@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 15 May 2009 14:29:33 +0000 (14:29 +0000)
commit356f6a0ee88402a55e0116c636539f8583b4f57a
tree9d86bb323839b472d9da2b077b163ce893bf9bf6
parent20aa9fe950adbfb7ca30ce613a7b13f848b7d847
someone forgot to merge the entities

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6734 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
misc/netradiant-NexuizPack/nexuiz.game/data/entities.def