aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2013-05-24 00:45:08 +0100
committerMelanie2013-05-24 00:45:08 +0100
commit09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch)
tree1856552dd68bfa23877f28842cb00e9e0089d1c4 /bin
parentMerge branch 'master' into careminster (diff)
parentBulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff)
downloadopensim-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')
-rwxr-xr-xbin/lib32/BulletSim.dllbin1010176 -> 982528 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2096576 -> 2271520 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin1142272 -> 1222656 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2265980 -> 2454504 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 1e94d05..d63ee1d 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 6216a65..03de631 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
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