diff options
author | Melanie | 2012-09-29 19:21:07 +0100 |
---|---|---|
committer | Melanie | 2012-09-29 19:21:07 +0100 |
commit | 71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch) | |
tree | b1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /bin/lib64/BulletSim.dll | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
download | opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2 opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz |
Merge branch 'master' into careminster
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to '')
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 731136 -> 747008 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index f01655b..1782c8e 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
Binary files differ | |||