diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 19:05:51 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 19:05:51 +0000 |
| commit | 773e8eb8ea3acc75b0e8137412458f77effffb70 (patch) | |
| tree | b3e5a3069ac0ef154f10971ae701940eab369fcc /indra/newview/llvoiceclient.h | |
| parent | 15ff4379e53eb5b3ed914c46c0051c3926de1ecb (diff) | |
| parent | a97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff) | |
merge from viewer2.
trivial xml conflict resolved.
Diffstat (limited to 'indra/newview/llvoiceclient.h')
0 files changed, 0 insertions, 0 deletions