summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.h
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-08-09 15:10:13 -0700
committerBrad Linden <brad@lindenlab.com>2024-08-09 15:10:13 -0700
commit3b2c32fdf940b37108e13eb69fcf0468469dc182 (patch)
tree6ddf3dba582210faed7c1af888774da282ce2f42 /indra/llcommon/llapp.h
parent105dc12980c8b90600a7a422985d067f4acbd794 (diff)
parent5cff84ff34652b8db50187cfe504def601add823 (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/llcommon/llapp.h')
0 files changed, 0 insertions, 0 deletions