phoenix-firestorm/indra
Ansariel 312d077884 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
2025-09-23 09:58:52 +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 Revert "Replace boost filesystem with std filesystem" 2025-09-05 13:44:57 -07:00
llimage Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llimagej2coj Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-23 09:58:52 +02:00
llinventory
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-09 19:52:09 +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-09-09 19:53:39 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-09-23 09:58:52 +02:00
llwebrtc Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-16 18:33:02 +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-09-23 09:58:52 +02:00
test Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
tools/manifests Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
viewer_components
win_crash_logger Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
CMakeLists.txt Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-06 12:03:58 +02:00
Version