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

diff options

author	Melanie	2011-12-05 19:08:19 +0000
committer	Melanie	2011-12-05 19:08:19 +0000
commit	1ece4feccd1cf5bb04dbddfe78586d1b67716a7a (patch)
tree	15317edd90ee91ee76aa282013ed4f4e5b2ca086 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parent	Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC_OLD-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.zip opensim-SC_OLD-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.gz opensim-SC_OLD-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.bz2 opensim-SC_OLD-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.xz

Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

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

0 files changed, 0 insertions, 0 deletions