Melanie c0b21d92c2 Merge branch 'avination' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-06-06 14:16:19 +01:00
..
Interfaces	Merge branch 'avination' into careminster	2012-06-06 14:16:19 +01:00
Scenes	Merge branch 'avination' into careminster	2012-06-06 14:16:19 +01:00
ModuleLoader.cs	Merge branch 'master' into careminster-presence-refactor	2011-04-12 00:27:39 +01:00