diff options
| author | Melanie | 2012-09-24 20:14:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-24 20:14:00 +0100 |
| commit | bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch) | |
| tree | 2ac67907f6333bbbc9e4d821c6607b53d0e22acb /bin/lib64 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2 opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so | bin | 142616 -> 0 bytes |
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib | bin | 125136 -> 0 bytes |
| -rwxr-xr-x | bin/lib64/libopenjpeg-dotnet-x86_64.so | bin | 0 -> 149368 bytes |
| -rwxr-xr-x | bin/lib64/libopenjpeg-dotnet.dylib | bin | 0 -> 147288 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so deleted file mode 100644 index be11bb4..0000000 --- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib deleted file mode 100644 index dc50775..0000000 --- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so new file mode 100755 index 0000000..7a9bdfc --- /dev/null +++ b/bin/lib64/libopenjpeg-dotnet-x86_64.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib new file mode 100755 index 0000000..18ca868 --- /dev/null +++ b/bin/lib64/libopenjpeg-dotnet.dylib | |||
| Binary files differ | |||