aee7a31bc3
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs |
||
---|---|---|
.. | ||
BulletSim.dll | ||
libBulletSim.so | ||
libode-x86_64.so | ||
libode.dylib | ||
libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so | ||
libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib | ||
libsqlite3.dylib | ||
libsqlite3_64.so | ||
ode.dll | ||
sqlite3.dll |