Melanie b9146a7922 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2013-03-15 23:45:32 +00:00
..
Base	minor: Make logged message in ServerUtils more consistent.	2013-03-15 22:05:18 +00:00
Handlers	Merge branch 'master' into careminster	2013-02-28 21:20:07 +00: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