Files
opensim/OpenSim/Region/Framework/Interfaces
Melanie a2c6094324 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
..
2009-10-01 01:17:47 +09:00
2009-10-01 01:17:47 +09:00
2009-10-01 01:17:47 +09:00
2010-09-12 13:43:49 -04:00
2012-07-06 22:37:19 +01:00
2010-05-02 08:15:12 -04:00
2009-10-01 01:17:47 +09:00
2010-09-12 13:43:49 -04:00