diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-07-29 17:36:46 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-07-29 17:36:46 +0000 |
| commit | 2c31217cc97938fd4bc482a888410dec59f54ddb (patch) | |
| tree | bab4c5372791a1c17e7759c2860d8c2459ba87c0 /indra/llinventory/llparcel.h | |
| parent | 17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 (diff) | |
svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
Diffstat (limited to 'indra/llinventory/llparcel.h')
0 files changed, 0 insertions, 0 deletions