Melanie 96b50d28f4 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-09-03 14:05:18 +01:00
..
ApplicationPlugins	…
Capabilities	…
ConsoleClient	…
Data	Merge branch 'master' into careminster	2012-08-31 01:32:18 +01:00
Framework	Merge branch 'avination' into careminster	2012-08-31 00:34:22 +01:00
Region	Merge branch 'master' into careminster	2012-09-03 14:05:18 +01:00
Server	…
Services	Merge branch 'avination' into careminster	2012-08-31 00:34:22 +01:00
Tests	Merge branch 'master' into careminster	2012-08-31 01:32:18 +01:00
Tools	…