aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
diff options
context:
space:
mode:
authorMelanie2012-02-25 16:24:01 +0000
committerMelanie2012-02-25 16:24:01 +0000
commit6386fdcda774beacbbdf34c1472bbfe0090b00d8 (patch)
tree526eb46b696bde5abe134134e9bf0eedaa77b2f9 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
parentMerge branch 'master' into careminster (diff)
parentPRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff)
downloadopensim-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 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins')
0 files changed, 0 insertions, 0 deletions