phoenix-firestorm/indra
Ansariel 668bf8e52c Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-10-22 23:39:09 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-18 12:16:32 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llaudio
llcharacter Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer 2024-08-27 18:33:30 +02:00
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-10-18 10:17:29 +02:00
llcorehttp Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-09 19:48:04 +02:00
llcrashlogger
llfilesystem Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-10-16 19:11:04 +02:00
llimage Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-10-16 19:11:04 +02:00
llimagej2coj
llinventory Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-22 23:39:09 +02:00
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llmeshoptimizer
llmessage Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-10-01 13:07:19 +02:00
llplugin Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-17 18:12:46 +02:00
llprimitive Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-07 10:34:08 +02:00
llrender Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-22 23:39:09 +02:00
llui Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-09-26 22:10:24 +02:00
llwebrtc
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-19 23:04:19 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-22 23:39:09 +02:00
test
tools
viewer_components defensively capture coroutine args by value 2024-08-26 15:01:04 -07:00
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt