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
..
Interfaces	Merge branch 'master' into varregion	2013-12-17 06:18:13 -08:00
Properties	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01:00
Scenes	Merge branch 'master' into varregion	2013-12-17 06:18:13 -08:00