diff options
| author | Melanie | 2012-02-21 10:20:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-21 10:20:56 +0000 |
| commit | 03e7bc1526d24efe23f61f6a8dee88010ccfdb8c (patch) | |
| tree | c2c2afef43a697dec1373ef5987f7d163031e5e2 /bin | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff) | |
| download | opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.zip opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.gz opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.bz2 opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/PhysX-wrapper.dll | bin | 57344 -> 0 bytes |
| -rwxr-xr-x | bin/PhysX_Wrapper_Dotnet.dll | bin | 8704 -> 0 bytes |
| -rwxr-xr-x | bin/lib32/BulletSim.dll (renamed from bin/BulletSim.dll) | bin | 562176 -> 562176 bytes |
| -rwxr-xr-x | bin/lib32/sqlite3.dll (renamed from bin/sqlite3.dll) | bin | 559244 -> 559244 bytes |
| -rwxr-xr-x | bin/lib64/BulletSim.dll (renamed from bin/BulletSim-x86_64.dll) | bin | 768000 -> 768000 bytes |
| -rwxr-xr-x | bin/lib64/sqlite3.dll | bin | 0 -> 1083392 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll deleted file mode 100755 index 5259ffc..0000000 --- a/bin/PhysX-wrapper.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll deleted file mode 100755 index c66bf3a..0000000 --- a/bin/PhysX_Wrapper_Dotnet.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/BulletSim.dll b/bin/lib32/BulletSim.dll index d1571cf..d1571cf 100755 --- a/bin/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/sqlite3.dll b/bin/lib32/sqlite3.dll index f29dc62..f29dc62 100755 --- a/bin/sqlite3.dll +++ b/bin/lib32/sqlite3.dll | |||
| Binary files differ | |||
diff --git a/bin/BulletSim-x86_64.dll b/bin/lib64/BulletSim.dll index ec21dfe..ec21dfe 100755 --- a/bin/BulletSim-x86_64.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/sqlite3.dll b/bin/lib64/sqlite3.dll new file mode 100755 index 0000000..815c4d3 --- /dev/null +++ b/bin/lib64/sqlite3.dll | |||
| Binary files differ | |||