Melanie
26d89777d8
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
..
2012-06-29 00:03:22 +01:00
2012-06-08 01:43:58 +01:00
2011-04-30 09:24:15 -07:00
2012-01-21 19:52:33 +00:00
2012-07-06 20:51:18 +01:00
2012-01-19 23:09:16 +00:00
2011-12-08 01:08:40 +01:00
2012-07-06 20:51:18 +01:00
2011-12-09 08:13:57 +00:00
2011-04-30 09:24:15 -07:00
2011-04-30 09:24:15 -07:00
2011-07-30 03:19:00 +01:00
2011-10-12 19:35:40 +01:00