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-06-08 15:47:14 -07:00
2010-05-16 17:04:13 +03:00
2010-10-30 19:06:47 +01:00
2013-05-11 01:27:37 +01:00
2013-07-04 09:51:31 -07:00
2012-01-30 20:34:32 +00:00
2012-09-27 16:43:18 -07:00
2013-07-14 15:47:54 -07:00
2014-01-16 00:16:33 +00:00
2010-11-21 17:19:24 -08:00
2010-05-16 17:04:13 +03:00
2013-02-19 07:26:40 -08:00
2010-10-18 19:08:26 +01:00
2013-10-04 20:03:12 +01:00
2010-05-16 17:04:13 +03:00
2013-12-07 01:29:15 +00:00
2010-05-16 17:04:13 +03:00
2013-03-15 23:42:16 +00:00