diff options
| author | Melanie | 2012-02-25 16:24:01 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-25 16:24:01 +0000 |
| commit | 6386fdcda774beacbbdf34c1472bbfe0090b00d8 (patch) | |
| tree | 526eb46b696bde5abe134134e9bf0eedaa77b2f9 /Makefile | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff) | |
| download | opensim-SC_OLD-6386fdcda774beacbbdf34c1472bbfe0090b00d8.zip opensim-SC_OLD-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.gz opensim-SC_OLD-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.bz2 opensim-SC_OLD-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions