Melanie 45e333652c Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs		2013-06-07 23:09:53 +01:00
..
Addons	Mantis #6620 (removed debug message)	2013-06-07 08:37:18 -07:00
ApplicationPlugins	Merge branch 'master' into careminster	2013-05-11 02:35:26 +01:00
Capabilities	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
ConsoleClient	Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.	2013-02-27 00:21:02 +00:00
Data	Merge branch 'master' into careminster	2013-06-04 21:09:25 +01:00
Framework	Merge branch 'avination-current' into careminster	2013-06-06 03:20:15 +01:00
Region	Merge branch 'master' into careminster	2013-06-07 23:09:53 +01:00
Server	Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster	2013-06-06 03:04:47 +01:00
Services	Merge branch 'master' into careminster	2013-06-04 21:09:25 +01:00
Tests	Merge branch 'master' into careminster	2013-05-30 21:48:09 +01:00
Tools	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00