opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2011-11-01 23:54:09 +0000
committer	Melanie	2011-11-01 23:54:09 +0000
commit	b69f679122fb7fdc0f77fc198e148f42797a2eef (patch)
tree	e06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parent	Merge branch 'master' into bigmerge (diff)
parent	Removed see_into_this_sim_from_neighbor configuration option. (diff)
download	opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2 opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz

Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

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

0 files changed, 0 insertions, 0 deletions