diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Tools/Configger/Properties/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions