diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/lib32/libBulletSim.dylib')
| -rwxr-xr-x | bin/lib32/libBulletSim.dylib | bin | 1181656 -> 1510988 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib index 02f8a7f..6efec3a 100755 --- a/bin/lib32/libBulletSim.dylib +++ b/bin/lib32/libBulletSim.dylib | |||
| Binary files differ | |||