diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-01-24 20:34:48 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-01-24 20:34:48 +0000 |
| commit | c48ebd889b3baa6adf051e3b114052291ac72603 (patch) | |
| tree | 73110f4607ef6a19d3345ec5e2ef35bb3d7aa33d /indra/llprimitive | |
| parent | 711b9749a12beee816537c50224eddd741887981 (diff) | |
svn merge -r 77415:77842 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server_abandoned -> release. Per josh\'s request, this got merged directly to release, did not go through normal lock phase. Made one minor change in the merge to avoid some silliness with the conflicts.
Diffstat (limited to 'indra/llprimitive')
0 files changed, 0 insertions, 0 deletions