diff options
author | Melanie | 2013-04-22 22:28:41 +0200 |
---|---|---|
committer | Melanie | 2013-04-22 22:28:41 +0200 |
commit | 671a97ef76f681503b7e2024c6037cb5814e245c (patch) | |
tree | 4d88ad2405f84ffbb3c9226f4c1ccff07b323766 /bin/OpenMetaverse.dll | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.zip opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.gz opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.bz2 opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-rwxr-xr-x | bin/OpenMetaverse.dll | bin | 1925120 -> 1785856 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.dll.config | 8 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 3e210ba..9054a99 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index f5423b2..6b7b999 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config | |||
@@ -1,5 +1,7 @@ | |||
1 | <configuration> | 1 | <configuration> |
2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" /> | 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1.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.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" /> |
4 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> | 4 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" /> |
5 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" /> | ||
6 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" /> | ||
5 | </configuration> | 7 | </configuration> |