aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32
diff options
context:
space:
mode:
authorMelanie2012-08-04 03:00:20 +0100
committerMelanie2012-08-04 03:00:20 +0100
commitb9c4a637b46d0c47d5348181dd75c4cc3d44f43d (patch)
tree7cf26233b2aaea5556f9842d7a44e35860098a95 /bin/lib32
parentMerge branch 'master' into careminster (diff)
parentStrip experimental tag from --publish option of "save oar" region console com... (diff)
downloadopensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.zip
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.gz
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.bz2
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rwxr-xr-xbin/lib32/BulletSim.dllbin533504 -> 533504 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2340496 -> 2341210 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 03e8f26..4f8bb4a 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 4e119c4..5fa17f2 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ