aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2011-02-07 23:07:36 +0000
committerMelanie2011-02-07 23:07:36 +0000
commit076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0 (patch)
treed6d80e7364bd96b95dddfbf03b708e2ea6ba3f77 /OpenSim/Services
parentFix merge issues (diff)
parentHunting down mantis #5365 (diff)
downloadopensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.zip
opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.gz
opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.bz2
opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
0 files changed, 0 insertions, 0 deletions