Melanie 09c2cd0d76 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2013-05-24 00:45:08 +01:00
..
BulletSim.dll	…
libBulletSim.dylib	…
libBulletSim.so	…
libode.so	…
libopenjpeg-dotnet.so	…
libsqlite3.txt	…
libsqlite3_32.so	…
ode.dll	update ode.dll for windows so both 32b and 64b are now version 0.12 (32b	2012-08-04 10:36:50 +01:00
sqlite3.dll	…