Melanie f567ff9f51 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-02-06 02:22:12 +00:00
..
BulletSim.dll	BulletSim: make removing zero width triangles from meshes optional	2013-02-05 17:19:55 -08:00
libBulletSim.so	BulletSim: rework some parameter setting implementation moving functionality that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.	2013-02-05 16:56:23 -08:00
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	…
sqlite3.dll	…