Melanie 36e6edfc65 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs		2012-01-26 00:44:32 +00:00
..
Application	Merge branch 'master' into careminster	2012-01-26 00:21:21 +00:00
ClientStack	Merge branch 'master' into careminster	2012-01-25 00:45:57 +00:00
CoreModules	Merge branch 'master' into careminster	2012-01-26 00:21:21 +00:00
DataSnapshot	Commenting out DataSnapShot message "Registering service discovery capability" for now.	2012-01-05 17:10:38 +00:00
Framework	Merge branch 'master' into careminster	2012-01-26 00:21:21 +00:00
OptionalModules	Merge branch 'master' into careminster	2012-01-25 00:45:57 +00:00
Physics	Merge branch 'master' into careminster	2012-01-26 00:21:21 +00:00
RegionCombinerModule	Merge branch 'master' into careminster	2011-12-18 10:49:45 +00:00
ReplaceableModules	Some module reshuffling, no user functionality yet	2009-07-10 20:46:16 +00:00
ScriptEngine	Merge branch 'master' into careminster	2012-01-26 00:44:32 +00:00
UserStatistics	minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db	2012-01-25 20:36:51 +00:00