Files
opensim/OpenSim/Framework
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-05 17:10:51 +00:00
2009-08-12 23:34:12 -04:00
2011-06-03 10:26:58 -07:00
2009-08-12 23:34:12 -04:00
2009-10-19 08:58:03 +09: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
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 12:54:31 -04:00
2009-10-01 01:17:47 +09:00
2012-03-21 00:26:02 +00:00