phoenix-firestorm/indra
Ansariel 8a55580fc9 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/newview/llvoicewebrtc.cpp
2025-11-17 23:26:11 +01:00
..
cmake Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'release/2025.08' of https://github.com/secondlife/viewer 2025-10-29 19:11:13 +01:00
llaudio Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-31 19:25:58 +01:00
llcharacter
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
llcorehttp
llcrashlogger Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llimage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llimagej2coj
llinventory [FIRE-36028] Fix OpenSim object permissions 2025-10-21 05:11:28 +10:00
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
llmeshoptimizer
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
llphysicsextensionsos Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llplugin Merge branch 'release/2025.08' of https://github.com/secondlife/viewer 2025-10-22 13:52:45 +02:00
llprimitive Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
llrender Merge branch 'release/2025.08' of https://github.com/secondlife/viewer 2025-10-29 19:11:13 +01:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
llwebrtc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-11-17 23:26:11 +01:00
test
tools/manifests
viewer_components
win_crash_logger
CMakeLists.txt Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
Version