diff options
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs')
0 files changed, 0 insertions, 0 deletions