Files
opensim/OpenSim/Region/Framework/Interfaces
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
..
2010-09-12 13:43:49 -04:00
2010-05-02 08:15:12 -04:00
2010-09-12 13:43:49 -04:00
2012-12-03 20:16:44 -05:00