diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Data/Null/NullUserAccountData.cs')
0 files changed, 0 insertions, 0 deletions