merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 5 Jun 2009 07:53:46 +0000 (07:53 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 5 Jun 2009 07:53:46 +0000 (07:53 +0000)
commitb382348de8ba77a51d6e90142172cf721b9c81bf
tree37cbcac9bfa70aa3ad009570db67cdf6142a53d6
parentb0e6a9fa58ee0d988a4d6df81d0956e6951447f1
merge

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