aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2012-04-25 16:49:07 +0100
committerMelanie2012-04-25 16:49:07 +0100
commit916e37238239cb579551641f86114ddd9b701c8e (patch)
tree5286e964609b507dc15336c8a208be8f4201e707 /OpenSim/Region/ScriptEngine/Shared/Api
parentMerge branch 'master' into careminster (diff)
parentSlight rewording of output messages. (diff)
downloadopensim-SC-916e37238239cb579551641f86114ddd9b701c8e.zip
opensim-SC-916e37238239cb579551641f86114ddd9b701c8e.tar.gz
opensim-SC-916e37238239cb579551641f86114ddd9b701c8e.tar.bz2
opensim-SC-916e37238239cb579551641f86114ddd9b701c8e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
0 files changed, 0 insertions, 0 deletions