entities.def merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 18 Dec 2009 21:23:04 +0000 (21:23 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 18 Dec 2009 21:23:04 +0000 (21:23 +0000)
commitc2c08550f76e523b89994eafb0de4c12d95c7545
treed9f2438ff97ee174a2ea387406427596ed720d1a
parent3babc774bbf3502c5c53a57837320d7ed4bd4156
entities.def merge

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