diff options
| author | KittoFlora | 2009-11-16 01:40:15 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-16 01:40:15 +0100 |
| commit | 873c9098d8627972e80a1688e85a4cda45e1e7fe (patch) | |
| tree | a0edc24aef11d5ad6928493d8985386f48dd2607 /bin/OpenMetaverse.dll | |
| parent | Merge branch 'vehicles' into tests (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenMetaverse.dll | bin | 1642496 -> 1650688 bytes | |||
| -rw-r--r-- | bin/OpenMetaverse.dll.config | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 8b07942..edbf3ce 100644 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index 489ee6b..13fdc11 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> | 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> |
| 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> |
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" /> | 4 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> |
| 5 | <dllmap os="!windows,osx" cpu="s390x" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-s390x" /> | 5 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> |
| 6 | <dllmap os="!windows,osx" cpu="ppc64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-ppc64" /> | 6 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> |
| 7 | </configuration> | 7 | </configuration> |