entities.def merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Mon, 4 May 2009 07:46:32 +0000 (07:46 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Mon, 4 May 2009 07:46:32 +0000 (07:46 +0000)
commitf03363d8da82a22615c21af547d12597c2eea4db
treec93bc24bcd3140334c8a8494546ed9aeaf7b9521
parentf53fe28470a24c239757b192b1c0d4c436415082
entities.def merge

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