Dan Lake 7210b7f517 Merge branch 'master' of git://opensimulator.org/git/opensim into dev ... Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-03-07 15:57:31 -08:00
..
Interfaces	Trigger changed event with CHANGED_TELEPORT when teleporting to another region.	2010-11-26 22:46:48 +01:00
Shared	Merge branch 'master' of git://opensimulator.org/git/opensim into dev	2011-03-07 15:57:31 -08:00
XEngine	Merge branch 'master' into danmerge	2010-11-30 17:36:36 -08:00