mirror of
https://github.com/opensim/opensim.git
synced 2026-05-16 11:46:04 +08:00
Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat