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
..
Agent	Merge branch 'master' into careminster	2013-11-03 21:34:36 +00:00
Asset	Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default	2014-01-20 00:38:42 -08:00
Avatar	Merge branch 'master' into careminster	2014-01-28 21:02:20 +00:00
Framework	Merge branch 'master' into careminster	2014-01-28 21:02:20 +00:00
Hypergrid	Merge branch 'master' into careminster	2013-10-04 20:03:12 +01:00
Properties	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01:00
Scripting	Merge branch 'master' into careminster	2013-11-23 19:13:22 +00:00
ServiceConnectorsIn	Revert "Add support for user preferences (im via email)"	2013-12-07 01:29:15 +00:00
ServiceConnectorsOut	Merge branch 'master' into careminster	2014-01-28 21:02:20 +00:00
World	Merge branch 'master' into careminster	2014-01-28 21:02:20 +00:00