phoenix-firestorm/indra/newview/app_settings
Andrey Lihatskiy b08ba3fa7b Merge branch 'main' into marchcat/2505-merge
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/llcommon/llsdutil.h
#	indra/llui/llflatlistview.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
2025-05-28 21:38:00 +03:00
..
camera
filters
shaders Merge pull request #3896 from williamweaver/fix/tonemap-hdr-blend 2025-04-15 10:31:25 -04:00
windlight
anim.ini
autoreplace.xml
cmd_line.xml
commands.xml
emoji_groups.xml
foldertypes.xml
grass.xml
ignorable_dialogs.xml
key_bindings.xml
keywords.ini
keywords_lsl_default.xml
lindenlab.pem
llsd-lsl-syntax.rng
llsd.xsd
logcontrol.xml
settings.xml Merge branch 'main' into marchcat/2505-merge 2025-05-28 21:38:00 +03:00
settings_crash_behavior.xml
settings_files.xml
settings_minimal.xml
settings_per_account.xml
std_bump.ini
toolbars.xml
trees.xml
viewerart.xml