diff options
| author | Melanie | 2012-09-09 13:30:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-09 13:30:24 +0100 |
| commit | 0d97beefce9eaa675c93504b7cb8230e75e17763 (patch) | |
| tree | 587516c2fdf96179c93a0d37624a8d3a9f7bebdd /bin/lib32 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing per-region configuration of limits on the number of prims one ca... (diff) | |
| download | opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.zip opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.gz opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.bz2 opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 556544 -> 567296 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2423331 -> 2503027 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 5673b91..0dd508c 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 a9768b2..747df24 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||