diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to 'OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs')
0 files changed, 0 insertions, 0 deletions