Files
opensim/OpenSim/Region/Framework/Interfaces
Melanie afca742392 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
..
2010-02-15 19:21:56 +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
2010-09-12 13:43:49 -04:00