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

diff options

author	Melanie	2011-10-25 01:42:52 +0100
committer	Melanie	2011-10-25 01:42:52 +0100
commit	a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e (patch)
tree	197217a9944bf63f7bfeacf52ee7482bfde52ca9 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parent	Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge (diff)
parent	remove some mono compiler warnings (diff)
download	opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.zip opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.gz opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.bz2 opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.xz

Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs')

0 files changed, 0 insertions, 0 deletions