aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
diff options
context:
space:
mode:
authorMelanie2013-05-24 01:11:49 +0100
committerMelanie2013-05-24 01:11:49 +0100
commite2e839a0cd4035ffacfcdc601dfc534a05bc4e0f (patch)
tree1c9b02e48835c85a84b85d690428bf65adfe7fd9 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parentMerge branch 'master' into careminster (diff)
parentminor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff)
downloadopensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.zip
opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.gz
opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.bz2
opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.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-18 03:10:46 +0000