diff options
| author | Melanie | 2012-01-14 06:09:19 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-14 06:09:19 +0000 |
| commit | 43128c9016ea4482bdc38b1b099b67929e28a68b (patch) | |
| tree | eafe72f6235ac4d148d4778d67a131a5228ca2dd /OpenSim/Services | |
| parent | Allow SmtpClients and other SSL users to work with our cert handler installed (diff) | |
| parent | Allow SmtpClients and other SSL users to work with our cert handler installed (diff) | |
| download | opensim-SC-43128c9016ea4482bdc38b1b099b67929e28a68b.zip opensim-SC-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.gz opensim-SC-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.bz2 opensim-SC-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services')
0 files changed, 0 insertions, 0 deletions