diff options
| author | Melanie | 2012-11-30 01:19:08 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-30 01:19:08 +0000 |
| commit | daa1d99513546121592bcab64d2178a570cd250e (patch) | |
| tree | b45c14a2771cef6bfee8477aea2a84f6f25ed873 /bin/lib32 | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_B... (diff) | |
| download | opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.zip opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.gz opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.bz2 opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 551424 -> 551424 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1707321 -> 1707601 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 2ae1c75..3f5011a 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 d4852a5..46d40fe 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||