merge
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 6 Sep 2009 19:12:58 +0000 (19:12 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 6 Sep 2009 19:12:58 +0000 (19:12 +0000)
commitb8f5fd2c23e367324bf1fb2ac86076d6d96d9c80
tree8d4475a72062d54f5ee5682cb715500ec69cf70e
parentad8a6a0d13fbd299b3316a96222efa4e468830d9
merge

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