diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
| commit | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (patch) | |
| tree | 7d38ae0017f606ef12416ab8a9ce80dcd966ed77 /indra/newview/llfloatervoicedevicesettings.cpp | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
| parent | b2b670d787eaa1789b87a62178c970dfb20c02d2 (diff) | |
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.cpp')
0 files changed, 0 insertions, 0 deletions