f8603a215d
Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 | ||