Files
opensim/OpenSim/Framework
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
..
2009-12-22 05:08:15 +00:00
2009-10-01 01:17:47 +09:00
2009-09-06 21:53:03 +10:00
2010-01-10 16:34:01 -08:00
2009-08-12 23:34:12 -04: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-04-17 16:34:17 +00:00
2009-08-12 23:34:12 -04:00
2009-10-01 01:17:47 +09:00
2009-02-12 09:53:12 +00:00
2009-10-01 01:17:47 +09:00
2009-10-01 01:17:47 +09:00
2009-10-01 09:38:36 +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
2009-10-01 01:17:47 +09:00