Melanie fb8e92c90b Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml		2012-07-23 18:54:12 +01:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-06-13 02:15:12 +01:00
Capabilities	Merge branch 'master' into careminster	2012-07-13 02:27:16 +01:00
ConsoleClient	Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.	2012-07-11 22:54:22 +01:00
Data	Merge branch 'avination' into careminster	2012-07-11 14:27:33 +01:00
Framework	Merge branch 'avination' into careminster	2012-07-20 09:35:22 +01:00
Region	Merge branch 'master' into careminster	2012-07-23 18:54:12 +01:00
Server	Merge branch 'master' into careminster	2012-07-13 02:27:16 +01:00
Services	Merge branch 'avination' into careminster	2012-07-16 22:22:42 +01:00
Tests	Merge branch 'avination' into careminster	2012-07-20 09:35:22 +01:00
Tools	Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.	2012-07-11 22:54:22 +01:00