phoenix-firestorm/indra
Ansariel d49359c086 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llaudio/llaudioengine_openal.cpp
#	indra/llui/lltextbox.h
#	indra/newview/llnotificationhandlerutil.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/pl/strings.xml
#	indra/newview/skins/default/xui/pt/strings.xml
#	indra/newview/skins/default/xui/ru/strings.xml
#	indra/newview/skins/default/xui/tr/strings.xml
2025-03-08 13:15:21 +01:00
..
cmake
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-01 01:09:19 +01:00
llaudio Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-08 13:15:21 +01:00
llcharacter
llcommon Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-05 10:12:03 +01:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-05 10:12:03 +01:00
llkdu
llmath
llmeshoptimizer
llmessage Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-08 13:15:21 +01:00
llplugin Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-08 13:15:21 +01:00
llprimitive
llrender Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-01 01:09:19 +01:00
llui Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-08 13:15:21 +01:00
llwebrtc
llwindow Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-03-07 17:19:04 +01:00
llxml Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-05 10:12:03 +01:00
mac_crash_logger
media_plugins
newview Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-08 13:15:21 +01:00
test
tools
viewer_components Fix xcode16 build errors 2025-02-13 17:30:08 +02:00
win_crash_logger
CMakeLists.txt Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-02-13 21:24:29 +01:00
Version
edit-me-to-trigger-new-build.txt