09c2cd0d76
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs |
||
---|---|---|
.. | ||
BulletSim.dll | ||
libBulletSim.dylib | ||
libBulletSim.so | ||
libode.so | ||
libopenjpeg-dotnet.so | ||
libsqlite3.txt | ||
libsqlite3_32.so | ||
ode.dll | ||
sqlite3.dll |