aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
diff options
context:
space:
mode:
authorMelanie2012-09-29 19:21:07 +0100
committerMelanie2012-09-29 19:21:07 +0100
commit71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch)
treeb1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parentMerge branch 'avination' into careminster (diff)
parentGet rid of some unnecessary casts in RemoteAdminPlugin. (diff)
downloadopensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip
opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz
opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2
opensim-SC-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz
Merge branch 'master' into careminster
Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 05:40:21 +0000