entities merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Wed, 10 Jun 2009 07:16:46 +0000 (07:16 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Wed, 10 Jun 2009 07:16:46 +0000 (07:16 +0000)
commit37e0e1dcbf2336e4d3ff679dbae444a5757239e7
tree32474f703d0283d566ba86c5ad6d8bf1d024f3e8
parent2e353139b73df75aba30a250309b867f4022a9b6
entities merge

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