aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib64
diff options
context:
space:
mode:
authorMelanie2012-12-07 03:49:04 +0000
committerMelanie2012-12-07 03:49:04 +0000
commit2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch)
tree8bfb77166642a49f142e60a3486a264e7635ef83 /bin/lib64
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip
opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz
opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2
opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/lib64')
-rwxr-xr-xbin/lib64/BulletSim.dllbin700928 -> 702464 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1846064 -> 1859487 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index fc0fdca..75999f0 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 a1b099c..a8a4720 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ