diff options
author | Melanie | 2012-12-07 03:49:04 +0000 |
---|---|---|
committer | Melanie | 2012-12-07 03:49:04 +0000 |
commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /bin | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenMetaverse.dll.config | 2 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 551936 -> 552960 bytes | |||
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1708731 -> 1720874 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 700928 -> 702464 bytes | |||
-rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1846064 -> 1859487 bytes |
5 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index b67da5f..f5423b2 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <configuration> | 1 | <configuration> |
2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" /> | 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" /> |
3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" /> |
4 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> | 4 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> |
5 | </configuration> | 5 | </configuration> |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 75d5bc3..9834faa 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 b648da1..3c8e034 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 fc0fdca..75999f0 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 a1b099c..a8a4720 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
Binary files differ | |||