diff options
| author | Melanie | 2013-05-30 21:48:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-30 21:48:09 +0100 |
| commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
| tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
| download | opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC-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')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 982528 -> 982528 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2271520 -> 2271724 bytes |
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1222656 -> 1222656 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2454504 -> 2454796 bytes |
4 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 | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index e155f0e..5fc09f6 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 ac64a40..925269d 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||