aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorMelanie2012-10-07 03:12:21 +0100
committerMelanie2012-10-07 03:12:21 +0100
commit0c5b36a4f700e6944f743b33e8b8d2d5fe565f93 (patch)
tree9fdc65657124754d43cfa749f7b5f6bae9ad4d2c /OpenSim/Services/GridService/GridService.cs
parentFix merge issues (diff)
parentFix threading in remote asset connector (diff)
downloadopensim-SC-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.zip
opensim-SC-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.gz
opensim-SC-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.bz2
opensim-SC-0c5b36a4f700e6944f743b33e8b8d2d5fe565f93.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
0 files changed, 0 insertions, 0 deletions