aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
diff options
context:
space:
mode:
authorMelanie2012-11-25 14:13:50 +0000
committerMelanie2012-11-25 14:13:50 +0000
commitfd7a83f439132062d500471830eb26e7183d30bc (patch)
treedb581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
parentMerge branch 'careminster' into avination (diff)
parentCombine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
downloadopensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-21 08:38:02 +0000