aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32
diff options
context:
space:
mode:
authorMelanie2012-08-01 23:03:03 +0100
committerMelanie2012-08-01 23:03:03 +0100
commitecffcf7f65151a45b6396354d66fec70a7f3bad8 (patch)
treec2b98c522344cf713421b21ddb4452e537396f5a /bin/lib32
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.zip
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.gz
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.bz2
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'bin/lib32')
-rwxr-xr-xbin/lib32/BulletSim.dllbin541696 -> 532480 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2469830 -> 2321137 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 06a3cf1..fd8f39a 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 ce187b0..72847e7 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ