Melanie 42c82b564e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs		2013-05-16 21:59:14 +01:00
..
Base	Fixed mantis #6609 -- LoadPlugin error messages on Robust.	2013-05-13 13:07:39 -07:00
Handlers	Merge branch 'master' into careminster	2013-05-16 21:59:14 +01:00
Properties	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00
ServerMain.cs	minor: log an error rather than info if a connector fails to load.	2013-03-15 22:08:11 +00:00