Files
opensim/OpenSim/Region/Framework/Interfaces
Melanie 90305001de Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
..
2010-09-12 13:43:49 -04:00
2012-01-13 11:35:44 -05:00
2010-11-25 01:22:05 +00:00
2010-09-12 13:43:49 -04:00