phoenix-firestorm/indra
Ansariel 6487febff0 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llwindow/lldxhardware.cpp
#	indra/llwindow/lldxhardware.h
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llviewerdisplay.cpp
2025-04-10 18:50:12 +02:00
..
cmake Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-04-04 12:46:39 +02:00
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-27 19:36:45 +01:00
llaudio
llcharacter
llcommon Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-04-04 12:46:39 +02:00
llcorehttp
llcrashlogger
llfilesystem
llimage #3809 Partial revert of "Fix J2C Upload" 2025-03-31 17:44:20 +03:00
llimagej2coj
llinventory
llkdu
llmath Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-04-03 23:08:03 +02:00
llmeshoptimizer
llmessage Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-27 19:36:45 +01:00
llplugin
llprimitive Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-03-31 23:55:28 +02:00
llrender Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-04-10 18:50:12 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202503 2025-04-04 00:42:49 +02:00
llwebrtc
llwindow Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-04-10 18:50:12 +02:00
llxml Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-12 19:31:51 +01:00
mac_crash_logger
media_plugins
newview Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 2025-04-10 18:50:12 +02:00
test Merge branch 'release/2025.03' of https://github.com/secondlife/viewer 2025-03-12 19:31:51 +01:00
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt