phoenix-firestorm/indra
Ansariel c7a44ac88b Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltexturectrl.h
2024-01-17 11:04:36 +01:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-01 11:27:42 +01:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra Merge branch 'main' of https://github.com/secondlife/viewer 2023-10-26 15:49:12 +02:00
linux_crash_logger
llappearance Replace (at least) our use of boost::unordered_map with std::unordered_map 2023-12-04 13:42:09 +01:00
llaudio Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-26 14:21:18 +01:00
llcharacter Replace (at least) our use of boost::unordered_map with std::unordered_map 2023-12-04 13:42:09 +01:00
llcommon Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 2024-01-17 11:04:36 +01:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-11-07 11:56:19 +01:00
llkdu
llmath
llmeshoptimizer
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-10-27 11:52:59 +02:00
llplugin
llprimitive Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer 2023-12-03 14:56:30 +01:00
llrender Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 2024-01-17 11:04:36 +01:00
llui Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-15 18:25:32 +01:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-15 23:35:39 +01:00
llxml
mac_crash_logger
media_plugins Linux: build fix, CEF update killed numpad controls for the moment 2023-11-05 18:31:07 +01:00
newview Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 2024-01-17 11:04:36 +01:00
test Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-01 11:27:42 +01:00
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt
fix-incredibuild.py