diff options
| author | Melanie | 2013-04-02 23:47:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-02 23:47:19 +0100 |
| commit | 41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch) | |
| tree | c5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /bin/lib64 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff) | |
| download | opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2 opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin/lib64')
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 720896 -> 721920 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1908442 -> 1920169 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 33c4d08..dca7116 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 79207fe..b63feb3 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||