Merge commit 'c87167c'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 19:20:04 +0000 (21:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Sep 2010 19:20:04 +0000 (21:20 +0200)
commit447c18af7f96b9fa0ca43165b48d5930fcf2f561
treeda22fd7d792a48a177dd6da948e9152831b397b1
parentac62d274ffd4e652db31bd7408879a38b8fb52bb
parentc87167c80f73880c94922e631b2d57a458a685c9
Merge commit 'c87167c'
scripts/entities.def