aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.dll.config
diff options
context:
space:
mode:
authorBlueWall2012-12-07 15:36:43 -0500
committerBlueWall2012-12-07 15:36:43 -0500
commit0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch)
treec48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /bin/OpenMetaverse.dll.config
parentMerge branch 'master' into connector_plugin (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz
Merge branch 'master' into connector_plugin
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
-rw-r--r--bin/OpenMetaverse.dll.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index b67da5f..f5423b2 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,5 +1,5 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
5</configuration> 5</configuration>