Andrey Lihatskiy 1ae6f5dd6f Merge branch 'main' into DRTVWR-591-maint-X ... # Conflicts: # indra/llui/lltransutil.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterenvironmentadjust.cpp # indra/newview/llpaneleditwater.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h		2024-03-27 00:33:40 +02:00
..
testplans	Create test plan for optimizeAwayAlpha (#663)	2024-01-23 15:45:33 -06:00
LGPL-license.txt	Fix spelling error on license file name	2022-11-18 06:23:11 -05:00
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'main' into marchcat/x-merge	2024-03-04 18:01:05 +02:00
releasenotes-where.txt	…
sl-logo-dark.png	Fix readme logo for dark theme sites	2022-11-18 06:22:43 -05:00
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	…