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)
commita20d92a172e2c96498214ce88d9a341051b48b96
tree8693da7e0290dfced031d70244ba8ab54d831a8f
parentb6e19f329ad7627599ff59c08b42d8bb60adff18
parenta26c37c0ed1873a707d0dcfd40dcbefd68d73626
Merge remote branch 'origin/tzork/ent-def-fixes'
scripts/entities.def