diff options
| author | Melanie | 2012-07-23 18:54:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-23 18:54:12 +0100 |
| commit | fb8e92c90b8bde44831a06d4a7adae64f181b5aa (patch) | |
| tree | fdbb76f70f8016e685b616b51a90f7b1ef21427b /bin/lib32 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update BulletSim DLLs and SOs (diff) | |
| download | opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.zip opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.gz opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.bz2 opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 538112 -> 540672 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2334329 -> 2347768 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index a3ccb98..8791ba5 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 0b286aa..da98509 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||