diff options
| author | Melanie | 2013-11-03 21:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-03 21:34:36 +0000 |
| commit | ba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch) | |
| tree | c03981fa7b9070af3cec331234b78762c49a8a06 /bin/lib64 | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add current .NET windows framework requirement to README. (diff) | |
| download | opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.zip opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.gz opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.bz2 opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.xz | |
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/lib64')
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1230848 -> 1231872 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2522559 -> 2522559 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 3afdf63..e8738e1 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 6a17848..ef3eb3a 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||