Merge remote branch 'origin/tzork/ent-def-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:22:37 +0000 (15:22 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:22:37 +0000 (15:22 +0100)
1  2 
scripts/entities.def

Simple merge