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 Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-05 17:50:50 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
llaudio
llcharacter Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
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 Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-06 19:07:19 +02:00
llkdu Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llmath Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llmeshoptimizer
llmessage
llplugin
llprimitive Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-12 22:50:51 +02:00
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