Ansariel efe7cdf153 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/newview/app_settings/settings.xml # indra/newview/skins/default/xui/de/panel_region_terrain.xml # indra/newview/skins/default/xui/es/panel_region_terrain.xml # indra/newview/skins/default/xui/fr/panel_region_terrain.xml # indra/newview/skins/default/xui/it/panel_region_terrain.xml # indra/newview/skins/default/xui/ja/panel_region_terrain.xml # indra/newview/skins/default/xui/pt/panel_region_terrain.xml # indra/newview/skins/default/xui/ru/panel_region_terrain.xml # indra/newview/skins/default/xui/tr/panel_region_terrain.xml # indra/newview/viewer_manifest.py		2024-03-15 22:52:24 +01:00
..
workflows	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer	2024-03-15 22:52:24 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00