phoenix-firestorm/indra
Ansariel 5e5a3f4102 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/lleventpoll.cpp
2025-09-22 23:11:55 +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
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
llcorehttp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-09-22 22:52:19 +02:00
llcrashlogger
llfilesystem
llimage
llimagej2coj Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
llinventory
llkdu Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-12 12:42:49 +02:00
llmath
llmeshoptimizer
llmessage
llplugin
llprimitive
llrender
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2025-09-22 23:11:55 +02:00
test
tools/manifests
viewer_components
win_crash_logger
CMakeLists.txt
Version