Melanie
26cc57b6ca
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
..
2012-10-24 03:08:58 +01:00
2012-07-13 01:03:28 +01:00
2011-12-05 20:44:20 +00:00
2012-09-14 00:07:39 +01:00
2011-12-05 20:44:20 +00:00
2010-11-21 22:17:25 +00:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2011-01-03 19:40:55 +00:00
2012-03-22 23:31:41 +00:00
2012-07-11 14:27:33 +01:00
2011-12-05 20:44:20 +00:00
2012-07-13 01:03:28 +01:00
2012-09-16 23:41:34 +02:00
2012-07-13 01:03:28 +01:00