OpenSimMirror/OpenSim/Region
Melanie db774d4292 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
..
Application Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
ClientStack Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
CoreModules Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
DataSnapshot minor: resolve some mono compiler warnings 2012-05-03 01:56:24 +01:00
Framework Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
OptionalModules Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
Physics Merge branch 'master' into careminster 2012-09-16 04:11:20 +01:00
RegionCombinerModule Move addin attributes to RegionCombinerModule.addin.xml 2012-09-07 13:21:06 -04:00
ReplaceableModules
ScriptEngine Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
UserStatistics Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 2012-07-25 23:11:50 +01:00