diff options
| author | Melanie | 2012-03-29 00:27:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-29 00:27:35 +0100 |
| commit | 7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch) | |
| tree | b09be52d5e7838b7c187c92f08f6c2bc73741a42 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
| download | opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 8 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 533504 -> 533504 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 619145 -> 2333901 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 686080 -> 686080 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 688866 -> 2528521 bytes | |||
| -rwxr-xr-x | bin/libBulletSim-x86_64.so | bin | 977886 -> 0 bytes | |||
| -rwxr-xr-x | bin/libBulletSim.so | bin | 864751 -> 0 bytes |
7 files changed, 4 insertions, 4 deletions
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config index 026417a..1bc7e41 100755 --- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config +++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" /> | 2 | <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" /> |
| 3 | <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" /> | 3 | <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" /> |
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" /> | 4 | <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" /> |
| 5 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" /> | 5 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" /> |
| 6 | </configuration> | 6 | </configuration> |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 5bef6e9..2c28063 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 9882f5b..f40f446 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 9f09ef8..d9e5e89 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 fa47bf1..06770a4 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||
diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so deleted file mode 100755 index 527eda5..0000000 --- a/bin/libBulletSim-x86_64.so +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so deleted file mode 100755 index 9f91bfd..0000000 --- a/bin/libBulletSim.so +++ /dev/null | |||
| Binary files differ | |||