diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/AvatarPickerReplyDataArgs.cs')
0 files changed, 0 insertions, 0 deletions