diff options
author | Melanie | 2013-02-07 20:51:51 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 20:51:51 +0000 |
commit | 45f5a6a6db16538d864ff90ab6952aea13007514 (patch) | |
tree | 48583f7c77afd88a4760ea9db9159741f659fe5b /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |
parent | Rename Bounciness to Restitution (diff) | |
parent | Change passed PhysicsParameter value from float to the more general string value (diff) | |
download | opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.zip opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.gz opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.bz2 opensim-SC-45f5a6a6db16538d864ff90ab6952aea13007514.tar.xz |
Merge branch 'master' into careminster
Conflicts:
bin/HttpServer_OpenSim.dll
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
0 files changed, 0 insertions, 0 deletions