26cc57b6ca
Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs |
||
---|---|---|
.. | ||
BulletSim.dll | ||
libBulletSim.so | ||
libode.so | ||
libopenjpeg-dotnet.so | ||
libsqlite3.txt | ||
libsqlite3_32.so | ||
ode.dll | ||
sqlite3.dll |