diff options
author | Justin Clark-Casey (justincc) | 2010-08-06 18:28:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-06 18:29:30 +0100 |
commit | 1270727c969db07831866947b611d49873031739 (patch) | |
tree | 8fd490eaf5c49d69be948fd9e58c0be1f7e38331 /bin/OpenMetaverse.dll.config | |
parent | Change XEngine to use the new constant (diff) | |
parent | fix mysql/mssql prim serialization problem (diff) | |
download | opensim-SC-1270727c969db07831866947b611d49873031739.zip opensim-SC-1270727c969db07831866947b611d49873031739.tar.gz opensim-SC-1270727c969db07831866947b611d49873031739.tar.bz2 opensim-SC-1270727c969db07831866947b611d49873031739.tar.xz |
Merge branch 'moap'
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
-rw-r--r-- | bin/OpenMetaverse.dll.config | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index 13fdc11..dc36a45 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-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> | 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="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> | 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="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> | 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> |