diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /bin/lib32 | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to 'bin/lib32')
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 541696 -> 0 bytes |
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2469830 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll deleted file mode 100755 index 06a3cf1..0000000 --- a/bin/lib32/BulletSim.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so deleted file mode 100755 index ce187b0..0000000 --- a/bin/lib32/libBulletSim.so +++ /dev/null | |||
| Binary files differ | |||