entities merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 28 Aug 2009 05:50:50 +0000 (05:50 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 28 Aug 2009 05:50:50 +0000 (05:50 +0000)
commit73a7584258bb5345849c7fa7accf25d9f7ed113a
treea920b6069bc1100aa312bc0479088a3a91ce9c0c
parent534363e9ff5fd8ebf17826916f5f8b9a0516d87d
entities merge

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