Melanie da9743d1d7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs

2012-03-26 14:22:49 +01:00

..

Minimodule

Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.

2012-01-05 20:51:49 +00:00

ObjectModules

Add copyright headers.

2009-03-07 02:11:50 +00:00

RegionReadyModule

RegionReady logging

2012-03-22 20:49:45 -04:00

ScriptModuleComms

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2012-03-26 14:21:15 +01:00

XmlRpcRouterModule

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00