Melanie 206bfe0657 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs		2013-01-16 17:05:37 +00:00
..
Linden	Merge branch 'master' into careminster	2013-01-16 17:05:37 +00:00
Properties	Added AssemblyInfos to every dll in the OpenSim.Region namespace.	2012-11-14 11:09:43 -08:00
ClientStackManager.cs	Formatting cleanup.	2009-10-01 01:17:47 +09:00
IClientNetworkServer.cs	Beginning work on the new LLUDP implementation	2009-10-05 17:38:14 -07:00
RegionApplicationBase.cs	Revert "Merge master into teravuswork", it should have been avination, not master.	2012-11-15 10:05:16 -05:00