entities.def merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 13 Dec 2009 15:54:30 +0000 (15:54 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 13 Dec 2009 15:54:30 +0000 (15:54 +0000)
commit1d54f6c7798131efb8713f218fb85c0e5e608bff
treeaa47d9a1b51601ac079b37aefb3c2ebd8d26318b
parent5c7ac1beedc8aeb02da9802b4ffe3b72bd171918
entities.def merge

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