diff options
author | Roxie Linden <roxie@lindenlab.com> | 2024-05-08 14:45:26 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-08 14:45:26 -0700 |
commit | 70af754dc09e29a492828e7cc4ed5db8d32eda3d (patch) | |
tree | 4d51dd366e2e2ce69610a06e7ab767824ab8869c /indra/newview/skins/default/xui/en/floater_bumps.xml | |
parent | c628c1f6e41f08c00540cf7f9ff3a5799faf0144 (diff) | |
parent | 818c8c6deaa755c02b64fb03766ee03d66021968 (diff) |
Merge branch 'project/webrtc-voice' of https://github.com/secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_bumps.xml')
0 files changed, 0 insertions, 0 deletions