Ansariel 85ae4ed95b Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llxml/llcontrol.cpp # indra/llxml/llxmlnode.cpp # indra/llxml/llxmltree.h # indra/newview/CMakeLists.txt # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreastmotion.cpp # indra/newview/llfloaterauction.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp		2024-03-08 16:56:01 +01:00
..
cmake	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-09 01:42:36 +01:00
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-18 00:09:57 +01:00
llaudio	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-13 00:54:24 +01:00
llcharacter	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-19 18:29:39 +01:00
llcommon	Disable typedefs for fake booleans	2024-02-22 11:45:18 +01:00
llcorehttp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
llcrashlogger	…
llfilesystem	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-08 16:56:01 +01:00
llimage	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
llimagej2coj	…
llinventory	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
llkdu	…
llmath	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-22 11:43:04 +01:00
llmeshoptimizer	…
llmessage	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
llplugin	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-20 10:49:47 +01:00
llprimitive	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
llrender	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-20 10:49:47 +01:00
llui	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-08 16:56:01 +01:00
llwindow	fix leftover BOOL, TRUE and FALSE	2024-02-22 17:45:33 +01:00
llxml	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-08 16:56:01 +01:00
mac_crash_logger	…
media_plugins	…
newview	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-08 16:56:01 +01:00
test	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-05 11:55:43 +01:00
tools	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
Version	…
edit-me-to-trigger-new-build.txt	…
fix-incredibuild.py	…