diff options
| author | Melanie | 2012-02-25 16:24:01 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-25 16:24:01 +0000 |
| commit | 6386fdcda774beacbbdf34c1472bbfe0090b00d8 (patch) | |
| tree | 526eb46b696bde5abe134134e9bf0eedaa77b2f9 /bin/lib64 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff) | |
| download | opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.zip opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.gz opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.bz2 opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/lib64/libode-x86_64.so (renamed from bin/libode-x86_64.so) | bin | 5546089 -> 5546089 bytes |
| -rw-r--r-- | bin/lib64/libode.dylib (renamed from bin/libode.dylib) | bin | 2916380 -> 2916380 bytes |
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so) | bin | 142616 -> 142616 bytes |
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib) | bin | 125136 -> 125136 bytes |
| -rwxr-xr-x | bin/lib64/libsqlite3.dylib (renamed from bin/libsqlite3.dylib) | bin | 2175300 -> 2175300 bytes |
| -rwxr-xr-x | bin/lib64/libsqlite3_64.so (renamed from bin/libsqlite3_64.so) | bin | 783200 -> 783200 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/bin/libode-x86_64.so b/bin/lib64/libode-x86_64.so index 9c3070a..9c3070a 100644 --- a/bin/libode-x86_64.so +++ b/bin/lib64/libode-x86_64.so | |||
| Binary files differ | |||
diff --git a/bin/libode.dylib b/bin/lib64/libode.dylib index 958d202..958d202 100644 --- a/bin/libode.dylib +++ b/bin/lib64/libode.dylib | |||
| Binary files differ | |||
diff --git a/bin/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 index be11bb4..be11bb4 100644 --- a/bin/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 | |||
| Binary files differ | |||
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib index dc50775..dc50775 100644 --- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib +++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib | |||
| Binary files differ | |||
diff --git a/bin/libsqlite3.dylib b/bin/lib64/libsqlite3.dylib index 94dcca8..94dcca8 100755 --- a/bin/libsqlite3.dylib +++ b/bin/lib64/libsqlite3.dylib | |||
| Binary files differ | |||
diff --git a/bin/libsqlite3_64.so b/bin/lib64/libsqlite3_64.so index 2646a9c..2646a9c 100755 --- a/bin/libsqlite3_64.so +++ b/bin/lib64/libsqlite3_64.so | |||
| Binary files differ | |||