aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32
diff options
context:
space:
mode:
authorMelanie2013-05-30 21:48:09 +0100
committerMelanie2013-05-30 21:48:09 +0100
commit669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree6ea7f58cc6365595281f823f3994d2d22299ee40 /bin/lib32
parentMerge branch 'master' into careminster (diff)
parentTry caching the user name for a new agent earlier on in the process of establ... (diff)
downloadopensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'bin/lib32')
-rwxr-xr-xbin/lib32/BulletSim.dllbin982528 -> 982528 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2271520 -> 2271724 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index d63ee1d..bc0e222 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 03de631..e09dd27 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ