phoenix-firestorm/indra
Ansariel bcaa272e91 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/gltf/asset.cpp
2025-08-16 12:35:36 +02:00
..
cmake
…
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance
…
llaudio
…
llcharacter
…
llcommon
…
llcorehttp
…
llcrashlogger
…
llfilesystem
…
llimage Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llimagej2coj Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llinventory
…
llkdu Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llmath
…
llmeshoptimizer
…
llmessage
…
llplugin
…
llprimitive
…
llrender
…
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506 2025-08-14 20:08:01 +02:00
llwebrtc Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llwindow Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llxml Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
mac_crash_logger
…
media_plugins
…
newview Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-16 12:35:36 +02:00
test
…
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…