Ansariel 2c52b8b243 Merge branch 'main' of https://github.com/secondlife/viewer ... # Conflicts: # indra/fix-incredibuild.py # indra/newview/CMakeLists.txt # indra/newview/llscrollingpanelparam.cpp # indra/newview/viewer_manifest.py		2024-04-24 16:27:23 +02:00
..
workflows	Merge branch 'main' of https://github.com/secondlife/viewer	2024-04-24 16:27:23 +02:00
dependabot.yml	Create dependabot.yml for github-actions	2024-04-03 17:10:03 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00