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

diff options

author	Melanie	2012-01-26 23:07:31 +0000
committer	Melanie	2012-01-26 23:07:31 +0000
commit	9d60b84f7805b78ae9413b4dc66c2fbbf387e503 (patch)
tree	6aa89951925561a5dbe031b9a92e9dd49c0a272a /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.zip opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.gz opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.bz2 opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/EstateSettings.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs')

0 files changed, 0 insertions, 0 deletions