Melanie 8e735efff0 Merge branch 'avination' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-06-02 02:01:48 +01:00
..
Application	Merge branch 'master' into careminster	2012-05-31 03:35:24 +01:00
ClientStack	Merge branch 'avination' into careminster	2012-06-02 02:01:48 +01:00
CoreModules	Merge branch 'avination' into careminster	2012-05-31 03:37:43 +01:00
DataSnapshot	minor: resolve some mono compiler warnings	2012-05-03 01:56:24 +01:00
Framework	Merge branch 'avination' into careminster	2012-06-02 02:01:48 +01:00
OptionalModules	Merge branch 'master' into careminster	2012-05-27 19:24:30 +01:00
Physics	Merge branch 'master' into careminster	2012-06-02 01:40:42 +01:00
RegionCombinerModule	Improve locking of RegionCombinerModule.m_regions	2012-05-19 04:59:36 +01:00
ReplaceableModules	…
ScriptEngine	Merge branch 'avination' into careminster	2012-06-02 02:01:48 +01:00
UserStatistics	Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.	2012-05-03 01:45:49 +01:00