Melanie
6d6b9ab791
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
..
2013-10-04 23:33:47 +01:00
2013-09-22 21:10:01 -05:00
2013-02-28 21:20:07 +00:00
2012-11-14 04:45:59 +00:00
2012-11-14 04:45:59 +00:00
2012-11-14 04:45:59 +00:00
2012-11-14 04:45:59 +00:00
2012-11-14 04:45:59 +00:00
2012-11-15 03:29:55 +00:00
2013-07-02 16:10:09 -07:00
2013-07-14 16:03:46 -07:00
2012-02-21 02:52:20 +00:00
2013-10-04 20:03:12 +01:00
2012-11-15 00:43:26 +00:00
2013-12-05 20:25:28 -05:00
2010-09-23 01:21:08 -04:00
2012-11-15 04:01:30 +00:00