diff options
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLAvatarData.cs')
0 files changed, 0 insertions, 0 deletions