diff options
author | Melanie | 2009-11-18 06:20:21 +0000 |
---|---|---|
committer | Melanie | 2009-11-18 06:20:21 +0000 |
commit | 5d0778014df68b48abb08c8f63204cf7e077af7f (patch) | |
tree | 5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Services/AssetService/AssetService.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Change PresenceData to PresenceInfo to remove a naming conflict in the (diff) | |
download | opensim-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