diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-31 15:32:03 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-31 15:32:03 -0700 |
| commit | ec2219724023144a0098199229aee7947a29af08 (patch) | |
| tree | 2f5f84f2718b507b63477d954fc2ce8917f7ba32 /indra/newview/tests | |
| parent | 4fcc4063e0862bb2a00c2f29839493815e7d65a6 (diff) | |
Fixups for conflicts that got dropped in the changeset 486d51877332 merge of viewer-2.0.0-3 with login-api.
Mostly code that had been modified in viewer-2.0.0-3 that had been moved elsewhere in login-api.
Diffstat (limited to 'indra/newview/tests')
0 files changed, 0 insertions, 0 deletions