Files
opensim/OpenSim/Region/Framework/Interfaces
Melanie 1ebc9d04aa Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
..
2009-10-01 01:17:47 +09:00
2009-10-01 01:17:47 +09:00
2010-02-15 19:21:56 +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
2010-09-12 13:43:49 -04:00
2011-10-17 01:56:25 +01:00
2010-11-25 01:22:05 +00:00
2010-05-02 08:15:12 -04:00
2012-01-03 11:10:23 -05:00
2009-10-01 01:17:47 +09:00
2010-09-12 13:43:49 -04:00