aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.dll.config
diff options
context:
space:
mode:
authorBlueWall2012-02-25 14:33:56 -0500
committerBlueWall2012-02-25 14:33:56 -0500
commit4177571a786f6ece38b29dc60328348fbe45b481 (patch)
treebc06a7f13fc5e751cfab5ef58bd3e9b612e12ba9 /bin/OpenMetaverse.dll.config
parentMerge branch 'master' into v3_support (diff)
parentPRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff)
downloadopensim-SC-4177571a786f6ece38b29dc60328348fbe45b481.zip
opensim-SC-4177571a786f6ece38b29dc60328348fbe45b481.tar.gz
opensim-SC-4177571a786f6ece38b29dc60328348fbe45b481.tar.bz2
opensim-SC-4177571a786f6ece38b29dc60328348fbe45b481.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
-rw-r--r--bin/OpenMetaverse.dll.config10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 13fdc11..e8c90a4 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="lib64/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="lib32/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="lib64/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="lib32/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="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
7</configuration> 7</configuration>