diff options
| author | Melanie | 2013-01-16 01:11:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:11:20 +0000 |
| commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
| tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /bin | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC_OLD-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC_OLD-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC_OLD-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC_OLD-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz | |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 551936 -> 551424 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1715168 -> 1720142 bytes |
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 700928 -> 700416 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1857493 -> 1858627 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 093ea31..014eca4 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 4d7018a..5e4d8cc 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 7956447..d00549e 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 2ce7f77..b94e264 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||