aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetService.cs
diff options
context:
space:
mode:
authorMelanie2009-11-18 06:20:21 +0000
committerMelanie2009-11-18 06:20:21 +0000
commit5d0778014df68b48abb08c8f63204cf7e077af7f (patch)
tree5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Services/AssetService/AssetService.cs
parentMerge branch 'master' into careminster (diff)
parentChange PresenceData to PresenceInfo to remove a naming conflict in the (diff)
downloadopensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
0 files changed, 0 insertions, 0 deletions