Files
opensim/bin
Melanie 7dad1ded2e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
..
2011-12-07 09:56:15 -05:00
2011-12-07 09:56:15 -05:00
2008-12-05 12:42:32 +00:00
2008-12-05 12:42:32 +00:00
2009-08-10 08:14:57 -07:00
2012-03-21 20:33:45 -04:00