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

diff options

author	Melanie	2011-11-28 11:06:38 +0000
committer	Melanie	2011-11-28 11:06:38 +0000
commit	dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch)
tree	4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
parent	Merge branch 'master' into bigmerge (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz

Merge branch 'master' into bigmerge

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

Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs')

0 files changed, 0 insertions, 0 deletions