phoenix-firestorm/indra
Ansariel 431b3b0c6d Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/pre-commit.yaml
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/llwindow/llopenglview-objc.mm
#	indra/newview/CMakeLists.txt
#	indra/newview/llappdelegate-objc.mm
2025-10-20 23:56:48 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llaudio
llcharacter
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-10-18 12:44:12 +02:00
llcorehttp
llcrashlogger
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llimage Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +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
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 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llrender Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
llwebrtc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2025-10-18 13:02:10 +02: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 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02: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