Melanie 0a876a305c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

2012-12-16 21:19:30 +00:00

..

Base

Fix formatting

2012-12-13 13:38:57 -05:00

Handlers

Merge branch 'master' into careminster

2012-12-09 21:27:32 +00:00

Properties

The last few AssemblyInfos. Finished!

2012-11-14 21:18:18 -08:00

ServerMain.cs

missed some conflict markup

2012-10-09 07:59:44 -04:00