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 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff) | |
| download | opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC_OLD-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 'bin/lib64')
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1142272 -> 1222656 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2265980 -> 2454504 bytes |
2 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 | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 08c00af..ac64a40 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||