Melanie 8c5445b774 Merge branch 'master' into careminster ... Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs		2013-05-01 21:39:49 +01:00
..
Addons	Groups: make some methods protected.	2013-04-25 17:01:57 -07:00
ApplicationPlugins	Merge branch 'master' into careminster	2013-04-04 03:17:57 +01:00
Capabilities	Merge branch 'master' into careminster	2013-05-01 21:39:49 +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-04-29 00:38:20 +01:00
Framework	Merge branch 'master' into careminster	2013-05-01 21:39:49 +01:00
Region	Merge branch 'master' into careminster	2013-05-01 21:39:49 +01:00
Server	Merge branch 'master' into careminster	2013-04-30 23:45:38 +01:00
Services	Merge branch 'master' into careminster	2013-04-29 00:38:20 +01:00
Tests	Merge branch 'master' into careminster	2013-04-30 23:45:38 +01:00
Tools	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00