Melanie 95d0a7d4fa Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-03-26 03:26:02 +00:00
..
Addons	Switched to using the other Util function with a default value.	2013-02-27 20:59:16 -08:00
ApplicationPlugins	Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster	2013-03-19 00:54:23 +00:00
Capabilities	Merge branch 'avination' into careminster	2013-03-03 13:24:37 +00: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-03-15 23:45:32 +00:00
Framework	Merge branch 'master' into careminster	2013-03-22 01:01:24 +00:00
Region	Merge branch 'master' into careminster	2013-03-26 03:26:02 +00:00
Server	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
Services	Merge branch 'master' into newmultiattach	2013-03-18 23:31:27 +00:00
Tests	Merge branch 'master' into careminster	2013-03-22 01:01:24 +00:00
Tools	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00