Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
..
2013-03-03 09:40:44 -05:00
2013-02-19 17:14:55 -08:00
2012-05-03 01:45:49 +01:00
2013-04-04 19:10:23 -04: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
2013-01-23 08:14:21 -05:00
2013-01-15 10:04:16 -05:00
2012-06-07 10:17:37 -04:00
2012-06-13 00:03:44 +01:00
2012-05-24 12:09:15 -04:00
2012-11-09 23:55:30 -05:00
2012-06-22 23:16:18 +01:00
2013-04-25 01:38:21 +02: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
2013-02-27 00:21:02 +00:00
2012-05-03 01:45:49 +01:00
2013-03-05 00:04:09 -05:00