Melanie 771d79e83e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml

2012-07-28 00:39:36 +01:00

..

Interfaces

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00

Shared

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

XEngine

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00