diff options
author | Melanie | 2011-10-11 23:17:47 +0100 |
---|---|---|
committer | Melanie | 2011-10-11 23:17:47 +0100 |
commit | ef9a811ea6cbad4493c4ac8653c3c0abdd632f28 (patch) | |
tree | 2fbcb334f48d6375654534596a4153f2455cb8c6 /bin/Newtonsoft.Json.pdb | |
parent | Merge commit '31125a5fd275a37261d87a336385f5447a62004e' into bigmerge (diff) | |
parent | Remove usage of Linden packet types from inside Attachments Module and interface (diff) | |
download | opensim-SC-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.zip opensim-SC-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.gz opensim-SC-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.bz2 opensim-SC-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.xz |
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
Diffstat (limited to 'bin/Newtonsoft.Json.pdb')
0 files changed, 0 insertions, 0 deletions