Melanie c6e9db5866 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs		2014-01-28 21:02:20 +00:00
..
Application.cs	minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"	2013-08-09 18:27:26 +01:00
ConfigurationLoader.cs	Convert tabs to spaces from previous commit 8c2b41b01	2014-01-28 00:04:55 +00:00
IApplicationPlugin.cs	* minor: Comments	2009-08-12 22:54:57 -04:00
OpenSim.cs	Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster	2014-01-05 20:03:48 +00:00
OpenSimBackground.cs	Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet	2009-10-09 02:10:53 -07:00
OpenSimBase.cs	Merge branch 'master' into careminster	2013-11-23 19:13:22 +00:00