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/Mono.Data.Sqlite.dll.config | |
| 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 'bin/Mono.Data.Sqlite.dll.config')
| -rw-r--r-- | bin/Mono.Data.Sqlite.dll.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index ccc0cf5..e66d1b7 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" /> | 2 | <dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" /> |
| 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" /> |
| 4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" /> | 4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" /> |
| 5 | </configuration> | 5 | </configuration> |