phoenix-firestorm/indra
Ansariel 25b7fd4fa9 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
# 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-10 13:04:14 +02:00
..
cmake Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice 2024-08-10 13:04:14 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice 2024-08-10 13:04:14 +02:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice 2024-08-10 13:04:14 +02:00
llkdu
llmath
llmeshoptimizer
llmessage
llplugin
llprimitive
llrender
llui Merge branch 'master' into webrtc_alpha 2024-07-19 08:57:46 +01:00
llwebrtc Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer 2024-08-10 12:51:51 +02:00
llwindow Updated VRAM reporting logic on Linux 2024-07-19 16:31:49 +01:00
llxml
mac_crash_logger
media_plugins Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-08-08 18:54:23 +02:00
newview Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice 2024-08-10 13:04:14 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt