Melanie
d3892bbd06
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
..
2013-01-15 10:04:16 -05:00
2013-02-05 00:23:17 +00:00
2012-05-03 01:45:49 +01:00
2013-01-23 19:31:22 +00:00
2012-05-03 01:45:49 +01:00
2012-05-03 01:45:49 +01:00
2012-05-03 01:45:49 +01:00
2009-06-01 06:37:14 +00:00
2013-01-23 08:14:21 -05:00
2013-01-15 10:04:16 -05:00
2009-06-10 04:28:56 +00:00
2009-06-01 06:37:14 +00:00
2011-03-17 05:48:42 -04:00
2009-06-01 06:37:14 +00:00
2012-06-07 10:17:37 -04:00
2009-06-01 06:37:14 +00:00
2009-06-01 06:37:14 +00:00
2012-06-13 00:03:44 +01:00
2009-06-01 06:37:14 +00:00
2012-05-24 12:09:15 -04:00
2009-06-01 06:37:14 +00:00
2012-11-09 23:55:30 -05:00
2012-06-22 23:16:18 +01:00
2013-01-19 02:38:04 +00:00
2012-07-28 00:39:36 +01:00
2012-05-03 01:45:49 +01:00
2012-05-03 01:45:49 +01:00
2011-12-05 20:44:20 +00:00
2012-09-30 07:48:03 -07:00
2012-09-30 07:48:03 -07:00
2012-09-30 07:48:03 -07:00
2012-05-03 01:45:49 +01:00
2009-06-01 06:37:14 +00:00