diff options
| author | Melanie | 2013-06-18 01:50:08 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-18 01:50:08 +0100 |
| commit | 56f4adeb60622aaec687f3a6699a03c964f59d5b (patch) | |
| tree | 0ba2fe5ffd3984b41fab05b56361fda507b2a34a /.hgignore | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | correct method doc for llRot2Axis() (diff) | |
| download | opensim-SC_OLD-56f4adeb60622aaec687f3a6699a03c964f59d5b.zip opensim-SC_OLD-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.gz opensim-SC_OLD-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.bz2 opensim-SC_OLD-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 '.hgignore')
0 files changed, 0 insertions, 0 deletions