aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
diff options
context:
space:
mode:
authorMelanie2013-09-16 22:32:53 +0100
committerMelanie2013-09-16 22:32:53 +0100
commit72206a0e294865bf0c93ea16910276a188d51ce6 (patch)
treef7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parentMerge branch 'master' into careminster (diff)
parentMono 2.0 fix - call ToArray() explicitly (diff)
downloadopensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.zip
opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz
opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2
opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz
Merge branch 'avination-current' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')
0 files changed, 0 insertions, 0 deletions