diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-28 12:50:59 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-28 12:50:59 -0700 |
| commit | 35f4de5ebe7c584eaa6c8734be1632e2751e09b5 (patch) | |
| tree | fc2568dab395ec339714ba315e8046aa20bac1ed /indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml | |
| parent | 7322623a6fe0e5120c07b720259e3beb325b097e (diff) | |
| parent | 9bc3dfbdeaba904999880f6b59306128c98469e8 (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into develop
# Conflicts:
# indra/newview/llvoicechannel.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml')
0 files changed, 0 insertions, 0 deletions