diff options
| author | Melanie | 2012-07-25 18:19:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-25 18:19:12 +0100 |
| commit | 6930d696e9961c5a4ecf1c06ebc7e72ec579876d (patch) | |
| tree | 325bc4ed1733cf26d6ff824e44d325d78507c0f5 /bin/lib32 | |
| parent | Remove support for the OS_NPC constant. That one seems to be overly paranoid (diff) | |
| parent | Rename "image queues clear" console command to "clear image queues" (diff) | |
| download | opensim-SC-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.zip opensim-SC-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.gz opensim-SC-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.bz2 opensim-SC-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 540672 -> 540672 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2347768 -> 2461336 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 8791ba5..322322a 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 da98509..493c8cb 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||