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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-04-30 23:45:38 +01:00

..

Base

minor: remove some mono compiler warnings in ServicesServerBase

2013-04-29 22:21:57 +01: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