mirror of
https://github.com/opensim/opensim.git
synced 2026-09-02 11:22:26 +08:00
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs