opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2012-06-13 02:15:12 +0100
committer	Melanie	2012-06-13 02:15:12 +0100
commit	12621201ba5751282f623fa3a7851c546976e47c (patch)
tree	c5a1d99983c959c809966253b107e594a412042d /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.zip opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.gz opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.bz2 opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs')

0 files changed, 0 insertions, 0 deletions