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
..
2011-10-14 23:32:15 +01:00
2014-01-28 20:47:36 +00:00
2013-10-12 20:47:10 -04:00
2013-08-24 03:40:44 -07:00
2014-01-10 20:51:28 +00:00
2013-10-17 22:31:15 +01:00
2013-11-08 17:55:01 +00:00
2013-11-08 17:55:01 +00:00
2012-09-18 23:57:00 +01:00
2013-04-10 13:20:55 +01:00
2013-02-06 02:40:32 +00:00
2013-08-20 21:09:17 -05:00
2013-08-20 21:09:17 -05:00
2012-01-03 20:22:15 +00:00
2013-04-23 15:01:20 -07:00
2013-04-22 22:58:33 +02:00
2013-06-04 21:11:16 +01:00
2013-03-16 03:14:11 -04:00
2013-03-16 03:14:11 -04:00
2013-02-12 14:47:26 -08:00
2013-04-17 21:31:18 -07:00
2013-04-17 21:31:18 -07:00
2013-04-17 21:31:18 -07:00
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00
2012-02-25 03:25:56 +00:00
2011-11-29 22:25:03 -05:00
2013-10-14 23:59:49 +01:00
2013-10-12 16:33:45 -05:00
2012-02-25 03:25:56 +00:00
2012-12-08 17:15:35 -05:00
2012-12-08 17:15:35 -05:00
2013-11-15 14:40:38 -08:00
2013-04-17 21:31:18 -07:00
2013-11-06 02:43:44 +01:00
2014-01-20 03:18:36 -08:00
2014-01-20 03:18:36 -08:00
2013-11-06 02:43:44 +01:00
2013-11-15 14:40:38 -08:00
2013-11-05 23:01:14 -08:00
2013-11-13 01:07:14 +00:00
2013-11-23 01:29:55 +00:00
2013-11-23 01:29:55 +00:00
2013-11-23 01:29:55 +00:00
2014-01-28 21:02:20 +00:00
2014-01-28 21:02:20 +00:00
2013-11-23 01:29:55 +00:00
2013-08-23 20:58:46 +01:00
2012-11-14 02:44:10 +00:00
2012-05-07 00:08:56 -07:00
2013-11-13 01:07:14 +00:00
2013-11-23 01:29:55 +00:00
2013-11-23 01:29:55 +00:00
2013-11-08 00:34:35 +00:00
2013-11-06 23:27:19 +00:00
2013-04-22 22:23:42 +02:00
2012-03-19 00:29:02 +00:00
2012-03-19 00:29:02 +00:00
2012-06-20 01:06:55 +01:00