Melanie 005c69511d Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs		2013-08-07 23:29:42 +01:00
..
Interfaces	Update SmartThreadPool to latest version 2.2.3 with a major and minor change.	2013-05-01 19:01:43 +01:00
Shared	Merge branch 'master' into careminster	2013-08-07 23:29:42 +01:00
XEngine	Merge branch 'master' into careminster	2013-05-01 21:39:49 +01:00