aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32
diff options
context:
space:
mode:
authorMelanie2013-04-02 23:47:19 +0100
committerMelanie2013-04-02 23:47:19 +0100
commit41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch)
treec5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /bin/lib32
parentMerge branch 'master' into careminster (diff)
parentminor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff)
downloadopensim-SC_OLD-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip
opensim-SC_OLD-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz
opensim-SC_OLD-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2
opensim-SC_OLD-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin/lib32')
-rwxr-xr-xbin/lib32/BulletSim.dllbin570368 -> 570880 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1751260 -> 1762207 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 689b34f..5432813 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 b8c813e..286d930 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ