diff options
| author | Melanie | 2012-08-16 02:46:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-16 02:46:48 +0100 |
| commit | 90ad98370aead53e886832a83a3e8793f361426e (patch) | |
| tree | b7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /bin/lib64 | |
| parent | Remove AreUpdatesSuspended flag because it does nothing (diff) | |
| parent | Do a proper null check to avoid the overloaded operator == trap (diff) | |
| download | opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.zip opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.gz opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2 opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/lib64')
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 685056 -> 706048 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2551398 -> 2599320 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index be191c0..c2a2bda 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 fc51b39..74d4f98 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||