aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:16:19 +0100
committerMelanie2011-10-11 23:16:19 +0100
commit0ae63d0e8b84ffc107c56b5841a286c2b0bc9a94 (patch)
tree20b77d1ef422611b974c7a177cd532859356cd36 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
parentMerge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge (diff)
parentRemove OpenSim.Region.Examples.SimpleModule (diff)
downloadopensim-SC-0ae63d0e8b84ffc107c56b5841a286c2b0bc9a94.zip
opensim-SC-0ae63d0e8b84ffc107c56b5841a286c2b0bc9a94.tar.gz
opensim-SC-0ae63d0e8b84ffc107c56b5841a286c2b0bc9a94.tar.bz2
opensim-SC-0ae63d0e8b84ffc107c56b5841a286c2b0bc9a94.tar.xz
Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge
Conflicts: OpenSim/Region/Examples/SimpleModule/ComplexObject.cs OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-18 16:57:10 +0000