diff options
| author | Melanie | 2012-11-08 04:51:00 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-08 04:51:00 +0000 |
| commit | b3e99a4d484d805866a6b7c40389683a98c8db36 (patch) | |
| tree | 2ca7a1655e91212c605c49109ace0209fed1b546 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add skeleton classes for shape objectification. This will eventual... (diff) | |
| download | opensim-SC_OLD-b3e99a4d484d805866a6b7c40389683a98c8db36.zip opensim-SC_OLD-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.gz opensim-SC_OLD-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.bz2 opensim-SC_OLD-b3e99a4d484d805866a6b7c40389683a98c8db36.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 598528 -> 599040 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2773926 -> 2778687 bytes |
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 764928 -> 765440 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 3033275 -> 3034072 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 0ed960a..51526a7 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 f71c308..8bb9d10 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 701ee4c..1a07d6a 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 cc839f6..bbdd380 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||