merge entities.def
authorm0rfar <m0rfar@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 30 May 2009 14:37:14 +0000 (14:37 +0000)
committerm0rfar <m0rfar@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 30 May 2009 14:37:14 +0000 (14:37 +0000)
commitc4b605640615ca99e55ed374d859f3cf8eb62828
tree3f97340e68c26d2d50e146ca10aa77cb99b41125
parentca2993d84970eb565d9e65ba68a34e716cf927e8
merge entities.def

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