aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.dll.config
diff options
context:
space:
mode:
authorMelanie2010-08-07 05:39:20 +0100
committerMelanie2010-08-07 05:39:20 +0100
commita04efe4a4df06c6d1e4adccc1e5d3d6f4842f067 (patch)
treeb2e36a0e20227fc45465e8f12ddab83044408586 /bin/OpenMetaverse.dll.config
parentCorrect display of landmark about info. Also correct region maturity rating (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.zip
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.gz
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.bz2
opensim-SC_OLD-a04efe4a4df06c6d1e4adccc1e5d3d6f4842f067.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
-rw-r--r--bin/OpenMetaverse.dll.config14
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>