diff options
| author | Melanie | 2010-08-07 05:41:41 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-07 05:41:41 +0100 |
| commit | 8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7 (patch) | |
| tree | a9058df2a8b7b49944a01f718946e0d076758c15 /bin/OpenMetaverse.dll.config | |
| parent | Correct display of landmark about info. Also correct region maturity rating (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.zip opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.gz opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.bz2 opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 dc36a45..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-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> |