diff options
| author | Melanie | 2010-10-04 04:49:54 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-04 04:49:54 +0100 |
| commit | da6816c805b8e68d5858ce9e241ea71941312c8c (patch) | |
| tree | d78a4f04cf6bc0f7245ad5048a0434fa585dd761 /bin/OpenMetaverse.dll.config | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-da6816c805b8e68d5858ce9e241ea71941312c8c.zip opensim-SC_OLD-da6816c805b8e68d5858ce9e241ea71941312c8c.tar.gz opensim-SC_OLD-da6816c805b8e68d5858ce9e241ea71941312c8c.tar.bz2 opensim-SC_OLD-da6816c805b8e68d5858ce9e241ea71941312c8c.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 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> |