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

diff options

author	Melanie	2012-07-13 02:27:16 +0100
committer	Melanie	2012-07-13 02:27:16 +0100
commit	64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch)
tree	12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff)
download	opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz

Merge branch 'master' into careminster

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

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

0 files changed, 0 insertions, 0 deletions