Melanie ae8733bf59 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs		2012-11-23 03:39:49 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-11-17 02:03:24 +00:00
Capabilities	Merge branch 'avination' into careminster	2012-11-20 01:21:15 +00:00
ConsoleClient	A few more AssemblyInfos in a few more dlls.	2012-11-14 08:10:15 -08:00
Data	Merge branch 'master' into careminster	2012-11-17 02:03:24 +00:00
Framework	Add a newline before the constant help text	2012-11-23 02:06:05 +00:00
Region	Merge branch 'master' into careminster	2012-11-23 03:39:49 +00:00
Server	Merge branch 'master' into careminster	2012-11-22 13:37:27 +00:00
Services	Merge branch 'master' into careminster	2012-11-17 02:03:24 +00:00
Tests	Merge branch 'avination' into careminster	2012-11-20 01:21:15 +00:00
Tools	The last few AssemblyInfos. Finished!	2012-11-14 21:18:18 -08:00