aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/IAvatarService.cs
diff options
context:
space:
mode:
authorMelanie2013-01-24 00:25:08 +0000
committerMelanie2013-01-24 00:25:08 +0000
commitbe4c8c4931637b7b0849d12c634599c702483364 (patch)
tree9a49626efcc10f1272b37176616a41476b044045 /OpenSim/Services/Interfaces/IAvatarService.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' into cooptermination (diff)
downloadopensim-SC-be4c8c4931637b7b0849d12c634599c702483364.zip
opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.gz
opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.bz2
opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAvatarService.cs')
0 files changed, 0 insertions, 0 deletions