phoenix-firestorm/indra
Ansariel f37e2785d5 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-27 12:54:37 +02:00
..
cmake Remove another occurrence of CMP0173 and remove the lines entirely (removed in LL develop already) 2025-06-28 20:00:23 +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 Reapply "Merge develop into glTF mesh import" 2025-07-17 11:23:51 +03:00
llcommon Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-27 12:54:37 +02:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'develop' of https://github.com/secondlife/viewer 2025-06-16 12:55:12 +02:00
llkdu
llmath
llmeshoptimizer
llmessage
llplugin Merge branch 'develop' of https://github.com/secondlife/viewer 2025-06-16 12:55:12 +02:00
llprimitive Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-27 12:54:37 +02:00
llrender Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2025-06-25 20:40:00 +02:00
llwebrtc
llwindow Remove another occurrence of CMP0173 and remove the lines entirely (removed in LL develop already) 2025-06-28 20:00:23 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-27 12:54:37 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt CI logging tweak 2025-06-06 03:11:11 +01:00
Version
edit-me-to-trigger-new-build.txt