Robert Adams 6937eec258 Merge branch 'master' into varregion ... Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2013-12-17 06:18:13 -08:00
..
Base	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01:00
Handlers	Merge branch 'master' into varregion	2013-12-17 06:18:13 -08: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