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-04-30 18:44:22 +01:00
2012-04-27 00:58:54 +01:00
2012-04-30 18:44:22 +01:00
2012-07-05 00:05:06 +01:00
2012-04-27 00:58:54 +01:00
2012-07-05 00:05:06 +01:00
2012-09-27 00:12:34 +01:00
2012-04-27 00:58:54 +01:00
2012-04-27 00:58:54 +01:00
2012-04-27 00:58:54 +01:00
2012-09-26 21:28:43 +01:00
2012-08-20 20:24:54 +01:00
2012-04-27 00:58:54 +01:00
2012-10-12 03:20:27 +01:00
2012-07-10 23:03:52 +01:00
2012-07-19 00:09:22 +01:00
2012-10-25 22:55:29 +01:00
2012-07-05 00:05:06 +01:00
2012-08-29 02:01:43 +01:00
2012-04-27 00:58:54 +01:00