Brad Linden 3b2c32fdf9 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		2024-08-09 15:10:13 -07:00
..
ISSUE_TEMPLATE	Improving issue templates. (#877)	2024-02-22 13:01:49 -08:00
workflows	Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus	2024-08-09 15:10:13 -07:00
labeler.yaml	Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice	2024-06-13 14:59:28 -07:00
release.yaml	Fix formatting in autobuild.xml (indents in close tags)	2023-12-05 20:37:21 +01:00