diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:10:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:10:13 -0700 |
| commit | 3b2c32fdf940b37108e13eb69fcf0468469dc182 (patch) | |
| tree | 6ddf3dba582210faed7c1af888774da282ce2f42 /indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png | |
| parent | 105dc12980c8b90600a7a422985d067f4acbd794 (diff) | |
| parent | 5cff84ff34652b8db50187cfe504def601add823 (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/CMakeLists.txt
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png')
0 files changed, 0 insertions, 0 deletions