aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2013-01-10 01:38:03 +0000
committerMelanie2013-01-10 01:38:03 +0000
commit3a495ccd561c9e1e95407d8657065265176a03dd (patch)
treecb7e7343e7c9a15bfdd77632d389fc6b6288b709 /bin
parentMerge branch 'avination' into careminster (diff)
parentOn baked texture save, replace any HG ID with an ordinary asset ID so the HGA... (diff)
downloadopensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.zip
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.gz
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.bz2
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lib32/BulletSim.dllbin551936 -> 551936 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1715168 -> 1715168 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin700928 -> 700928 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1857493 -> 1857493 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index b01896e..093ea31 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 d964c11..4d7018a 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 20eed6a..7956447 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 5bb28ed..2ce7f77 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ