diff options
| author | Melanie | 2013-04-10 13:20:55 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-10 13:20:55 +0100 |
| commit | 7cf377fff02de4504965420baaabd56b9a5379ee (patch) | |
| tree | 5dde9202c352446232e53af9ce85efad4735a572 /bin/lib64 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff) | |
| download | opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.zip opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2 opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'bin/lib64')
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 721920 -> 1140224 bytes |
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1920169 -> 2258808 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index dca7116..491ac22 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index b63feb3..a8ad533 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||