diff options
author | Melanie | 2011-10-12 00:10:30 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 00:10:30 +0100 |
commit | e4f3ba8610dc7648cb9d789fbaa35276b92fb975 (patch) | |
tree | dd973171f9999c769ac823d27a457c24f411f226 /bin/assets | |
parent | Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge (diff) | |
parent | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff) | |
download | opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.zip opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.gz opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.bz2 opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.xz |
Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
Diffstat (limited to 'bin/assets')
0 files changed, 0 insertions, 0 deletions