Ansariel aa7c8eeaef Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofiler.h # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llinventorymodel.cpp # indra/newview/llstartup.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h		2023-11-07 11:56:19 +01:00
..
cmake	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2023-10-27 11:52:59 +02: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	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-10-04 11:38:21 +02:00
llaudio	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2023-10-27 11:52:59 +02:00
llcharacter	…
llcommon	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-11-07 11:56:19 +01:00
llcorehttp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-10-04 11:38:21 +02:00
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	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-10-18 14:55:45 +02:00
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-559' of https://github.com/secondlife/viewer	2023-11-07 11:56:19 +01:00
llrender	Linux: Experimentally apply Alchemy's AMD/intel GPU memory detection fix - Thanks to Rye for this code	2023-11-02 05:53:30 +01:00
llui	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-10-11 12:58:24 +02:00
llwindow	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-11-07 11:56:19 +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-559' of https://github.com/secondlife/viewer	2023-11-07 11:56:19 +01:00
test	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2023-10-27 11:52:59 +02:00
tools	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
Version	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…