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
..
Interfaces	Fix script "Running" behavior	2012-06-23 04:15:14 -04:00
Shared	Merge branch 'avination' into careminster	2012-07-06 20:51:18 +01:00
XEngine	Add preservation of running state of scripts when drag-copying.	2012-07-01 18:30:59 +01:00