aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32
diff options
context:
space:
mode:
authorMelanie2012-08-18 13:17:39 +0100
committerMelanie2012-08-18 13:17:39 +0100
commitaee7a31bc3b5348c883e0d750bab991d853db642 (patch)
tree9d38c2ec7cc62019ab3ea95a3716d28e1451c397 /bin/lib32
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.zip
opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.gz
opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.bz2
opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/lib32')
-rwxr-xr-xbin/lib32/BulletSim.dllbin550400 -> 553472 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2387345 -> 2387051 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 0f2d522..cc55f00 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 783c9a2..26ad52b 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ