phoenix-firestorm/indra
Ansariel 98a48cf1c1 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/pipeline.cpp
2025-10-11 14:35:54 +02:00
..
cmake Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-12 12:42:49 +02:00
copy_win_scripts
doxygen
integration_tests Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
lib/python/indra
linux_crash_logger
llappearance
llaudio Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llcharacter
llcommon Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-12 12:42:49 +02:00
llcorehttp Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llcrashlogger Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llfilesystem Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-11 14:35:54 +02:00
llimage Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-11 14:35:54 +02:00
llimagej2coj Fixed compilation error caused when merging upstream 2025-09-23 23:51:52 +10:00
llinventory #4772 fix group ownership detection for deeded objects (FS:TJ- Fixes issue FIRE-35983) 2025-10-10 04:27:49 +10:00
llkdu Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-12 12:42:49 +02:00
llmath Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-30 17:27:19 +02:00
llmeshoptimizer
llmessage Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llplugin Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llprimitive Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llrender Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-11 14:35:54 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-30 17:27:19 +02:00
llwebrtc Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-23 10:01:04 +02:00
llwindow Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-12 12:42:49 +02:00
llxml Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
mac_crash_logger
media_plugins Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
newview Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-11 14:35:54 +02:00
test Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
tools/manifests
viewer_components
win_crash_logger
CMakeLists.txt Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-06 12:03:58 +02:00
Version