aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
diff options
context:
space:
mode:
authorMelanie2013-06-18 01:50:08 +0100
committerMelanie2013-06-18 01:50:08 +0100
commit56f4adeb60622aaec687f3a6699a03c964f59d5b (patch)
tree0ba2fe5ffd3984b41fab05b56361fda507b2a34a /OpenSim/Capabilities/LLSDAssetUploadResponse.cs
parentMerge branch 'master' into careminster (diff)
parentcorrect method doc for llRot2Axis() (diff)
downloadopensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.zip
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.gz
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.bz2
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions