aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
diff options
context:
space:
mode:
authorMelanie2012-09-24 20:14:00 +0100
committerMelanie2012-09-24 20:14:00 +0100
commitbbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch)
tree2ac67907f6333bbbc9e4d821c6607b53d0e22acb /bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
parentMerge branch 'master' into careminster (diff)
parentHG Rez object: warn the user if the item or asset cannot be found. (diff)
downloadopensim-SC_OLD-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip
opensim-SC_OLD-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz
opensim-SC_OLD-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2
opensim-SC_OLD-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so')
-rw-r--r--bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.sobin128100 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
deleted file mode 100644
index 53543e7..0000000
--- a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
+++ /dev/null
Binary files differ