Melanie fa52effb27 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs

2012-10-16 04:30:01 +01:00

..

Linden

Merge branch 'master' into careminster

2012-10-16 04:30:01 +01: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

Added unit tests for multi-region OARs

2012-09-14 20:32:25 +01:00