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

diff options

author	Melanie	2012-10-17 00:12:30 +0100
committer	Melanie	2012-10-17 00:12:30 +0100
commit	39cbf4f7a114dca999afc42c74bfd100212e3842 (patch)
tree	b0b3f9f1350b92eca7dea1460a679dfa8d0ea378 /OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	minor: Make BasicCircuitTests.SetUp() call overriden base method instead of i... (diff)
download	opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.zip opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.gz opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.bz2 opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs

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

0 files changed, 0 insertions, 0 deletions