diff options
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization')
0 files changed, 0 insertions, 0 deletions