aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.dll.config
diff options
context:
space:
mode:
authorKittoFlora2009-11-02 21:53:51 +0100
committerKittoFlora2009-11-02 21:53:51 +0100
commit2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch)
treee44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /bin/OpenMetaverse.dll.config
parentMerge branch 'master' into vehicles (diff)
parentRemoving Console.WriteLine()s that were brought in with the revert (diff)
downloadopensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip
opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz
opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2
opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
-rw-r--r--bin/OpenMetaverse.dll.config6
1 files changed, 3 insertions, 3 deletions
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>