diff options
| author | Melanie | 2013-02-06 02:22:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:22:12 +0000 |
| commit | f567ff9f51aebe522c210b5d34b26754de157c91 (patch) | |
| tree | eac712a0ba78ca92b3178e2d532307c4ed489b06 /bin/lib32 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... (diff) | |
| download | opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.zip opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.gz opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.bz2 opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 545280 -> 546304 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1690012 -> 1695269 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 24dffac..de4f95a 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 7e3ed20..674a08a 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||