diff options
author | Melanie | 2013-05-24 00:45:08 +0100 |
---|---|---|
committer | Melanie | 2013-05-24 00:45:08 +0100 |
commit | 09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch) | |
tree | 1856552dd68bfa23877f28842cb00e9e0089d1c4 /bin/lib64/BulletSim.dll | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff) | |
download | opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1142272 -> 1222656 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 68cfcc4..e155f0e 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
Binary files differ | |||