Merge remote branch 'origin/mirceakitsune/gravity_trigger'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 13:01:32 +0000 (15:01 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 13:01:32 +0000 (15:01 +0200)
commit25bb540106fb3b7306f0a94e1f3ce3877db7f456
tree9387cb2195944eb07b72b66e0d9dd17f8016db12
parentf879e0523ca5a81650ea0edee80ad5a8410e25ae
parent6496efc7172746dcde2aadaf34cd167f99c64120
Merge remote branch 'origin/mirceakitsune/gravity_trigger'

Conflicts:
scripts/entities.def
scripts/entities.def