Melanie
13cd8c17d7
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
..
2013-02-19 17:14:55 -08:00
2013-05-11 02:35:26 +01:00
2013-04-10 13:20:55 +01:00
2012-04-30 15:54:35 +01:00
2012-04-30 15:54:35 +01:00
2012-01-22 11:36:04 +00:00
2010-02-05 18:07:59 -08:00
2012-04-30 15:54:35 +01:00
2013-02-22 01:28:54 +00:00
2010-05-07 21:29:56 -07:00
2013-02-19 07:26:40 -08:00
2012-04-30 15:54:35 +01:00
2010-06-19 23:45:56 +01:00
2013-04-28 09:03:09 -07:00
2012-12-09 15:08:32 -05:00
2012-10-09 01:35:27 +01:00
2013-04-25 09:23:15 -07:00
2012-04-30 19:04:38 +01:00
2013-03-15 23:45:32 +00:00
2012-11-15 04:01:30 +00:00